build

src/api/components/remoteSelect.ts

@@ -29,3 +29,9 @@ export async function httpCompanyAll(
     data
   });
 }
+// 企业卡类型
+export async function httpGroupList(data: object = {}): Promise<DataType<any>> {
+  return http.request("post", `${VITE_PROXY_DOMAIN_REAL}admin/groupList`, {
+    data
+  });
+}

src/api/mobile/exchangeOrder.ts

@@ -3,21 +3,43 @@ import { http } from "/@/utils/http";
 
 const { VITE_PROXY_DOMAIN_REAL } = loadEnv();
 
-//列表
-export async function httpList(): Promise<DataType<any>> {
+//获取数据
+export async function httpList(): Promise<DataType<Menu[]>> {
   return http.request(
     `post`,
-    `${VITE_PROXY_DOMAIN_REAL}admin/orderExchangeList`,
+    `${VITE_PROXY_DOMAIN_REAL}admin/orderServiceList`,
     {
       data: {}
     }
   );
 }
-//详情
-export async function httpDetail(data: object): Promise<DataType<any[]>> {
+// 详情
+export async function httpDetail(data: object = {}): Promise<DataType<any>> {
+  return http.request(
+    "post",
+    `${VITE_PROXY_DOMAIN_REAL}admin/orderServiceRead`,
+    {
+      data
+    }
+  );
+}
+
+//发货
+export async function httpDeliver(): Promise<DataType<Menu[]>> {
+  return http.request(
+    `post`,
+    `${VITE_PROXY_DOMAIN_REAL}admin/orderServiceDeliver`,
+    {
+      data: {}
+    }
+  );
+}
+
+//导出
+export async function httpExport(data: object): Promise<DataType<Menu[]>> {
   return http.request(
     `post`,
-    `${VITE_PROXY_DOMAIN_REAL}admin/orderExchangeRead`,
+    `${VITE_PROXY_DOMAIN_REAL}admin/orderServiceExport`,
     {
       data
     }

src/api/mobile/exchangeStock.ts

@@ -3,11 +3,21 @@ import { http } from "/@/utils/http";
 
 const { VITE_PROXY_DOMAIN_REAL } = loadEnv();
 
+// 添加
+export async function httpAdd(data: object = {}): Promise<DataType<any>> {
+  return http.request(
+    "post",
+    `${VITE_PROXY_DOMAIN_REAL}admin/inventoryExchangeAdd`,
+    {
+      data
+    }
+  );
+}
 //改
 export async function httpUpdate(data: object): Promise<DataType<any[]>> {
   return http.request(
     `post`,
-    `${VITE_PROXY_DOMAIN_REAL}/admin/inventoryExchangeEdit`,
+    `${VITE_PROXY_DOMAIN_REAL}admin/inventoryExchangeEdit`,
     {
       data
     }
@@ -18,7 +28,7 @@ export async function httpUpdate(data: object): Promise<DataType<any[]>> {
 export async function httpDetail(data: object): Promise<DataType<any[]>> {
   return http.request(
     `post`,
-    `${VITE_PROXY_DOMAIN_REAL}/admin/inventoryExchangeRead`,
+    `${VITE_PROXY_DOMAIN_REAL}admin/inventoryExchangeRead`,
     {
       data
     }
@@ -28,17 +38,17 @@ export async function httpDetail(data: object): Promise<DataType<any[]>> {
 export async function httpList(data: object): Promise<DataType<any[]>> {
   return http.request(
     `post`,
-    `${VITE_PROXY_DOMAIN_REAL}/admin/inventoryExchangeList`,
+    `${VITE_PROXY_DOMAIN_REAL}admin/inventoryExchangeList`,
     {
       data
     }
   );
 }
-//改状态
+//修改记录
 export async function httpLog(data: object): Promise<DataType<any[]>> {
   return http.request(
     `post`,
-    `${VITE_PROXY_DOMAIN_REAL}/admin/inventoryExchangeLog`,
+    `${VITE_PROXY_DOMAIN_REAL}admin/inventoryExchangeLog`,
     {
       data
     }

src/api/mobile/serviceOrder.ts

@@ -0,0 +1,47 @@
+import { loadEnv } from "@build/index";
+import { http } from "/@/utils/http";
+
+const { VITE_PROXY_DOMAIN_REAL } = loadEnv();
+
+//获取数据
+export async function httpList(): Promise<DataType<Menu[]>> {
+  return http.request(
+    `post`,
+    `${VITE_PROXY_DOMAIN_REAL}admin/orderServiceList`,
+    {
+      data: {}
+    }
+  );
+}
+// 详情
+export async function httpDetail(data: object = {}): Promise<DataType<any>> {
+  return http.request(
+    "post",
+    `${VITE_PROXY_DOMAIN_REAL}admin/orderServiceRead`,
+    {
+      data
+    }
+  );
+}
+
+//发货
+export async function httpDeliver(): Promise<DataType<Menu[]>> {
+  return http.request(
+    `post`,
+    `${VITE_PROXY_DOMAIN_REAL}admin/orderServiceDeliver`,
+    {
+      data: {}
+    }
+  );
+}
+
+//导出
+export async function httpExport(data: object): Promise<DataType<Menu[]>> {
+  return http.request(
+    `post`,
+    `${VITE_PROXY_DOMAIN_REAL}admin/orderServiceExport`,
+    {
+      data
+    }
+  );
+}

src/api/mobile/shopOrder.ts

@@ -3,27 +3,45 @@ import { http } from "/@/utils/http";
 
 const { VITE_PROXY_DOMAIN_REAL } = loadEnv();
 
-//获取所有menu
-export async function httpList(): Promise<DataType<any>> {
-  return http.request(`post`, `${VITE_PROXY_DOMAIN_REAL}admin/versionlist`, {
-    data: {}
-  });
+//获取数据
+export async function httpList(): Promise<DataType<Menu[]>> {
+  return http.request(
+    `post`,
+    `${VITE_PROXY_DOMAIN_REAL}admin/orderServiceList`,
+    {
+      data: {}
+    }
+  );
 }
-//更新
-export async function httpUpdate(data: object): Promise<DataType<any[]>> {
-  return http.request(`post`, `${VITE_PROXY_DOMAIN_REAL}admin/AccoountEdit`, {
-    data
-  });
+// 详情
+export async function httpDetail(data: object = {}): Promise<DataType<any>> {
+  return http.request(
+    "post",
+    `${VITE_PROXY_DOMAIN_REAL}admin/orderServiceRead`,
+    {
+      data
+    }
+  );
 }
-//详情
-export async function httpDetail(data: object): Promise<DataType<any[]>> {
-  return http.request(`post`, `${VITE_PROXY_DOMAIN_REAL}admin/AccoountRead`, {
-    data
-  });
+
+//发货
+export async function httpDeliver(): Promise<DataType<Menu[]>> {
+  return http.request(
+    `post`,
+    `${VITE_PROXY_DOMAIN_REAL}admin/orderServiceDeliver`,
+    {
+      data: {}
+    }
+  );
 }
-//记录
-export async function httpLog(data: object): Promise<DataType<any[]>> {
-  return http.request(`post`, `${VITE_PROXY_DOMAIN_REAL}admin/AccoountRead`, {
-    data
-  });
+
+//导出
+export async function httpExport(data: object): Promise<DataType<Menu[]>> {
+  return http.request(
+    `post`,
+    `${VITE_PROXY_DOMAIN_REAL}admin/orderServiceExport`,
+    {
+      data
+    }
+  );
 }

src/api/mobile/shopStock.ts

@@ -3,59 +3,54 @@ import { http } from "/@/utils/http";
 
 const { VITE_PROXY_DOMAIN_REAL } = loadEnv();
 
-//获取所有menu
-export async function httpList(): Promise<DataType<Menu[]>> {
-  return http.request(`post`, `${VITE_PROXY_DOMAIN_REAL}admin/menulist`, {
-    data: {}
-  });
-}
-
-//更新菜单状态
-export async function httpMenuStatus(): Promise<DataType<Menu[]>> {
-  return http.request(`post`, `${VITE_PROXY_DOMAIN_REAL}admin/menustatus`, {
-    data: {}
-  });
-}
-
-//获取menu节点下的action
-export async function httpActionList(data: object): Promise<DataType<Menu[]>> {
-  return http.request(`post`, `${VITE_PROXY_DOMAIN_REAL}admin/menuaction`, {
-    data
-  });
+// 添加
+export async function httpAdd(data: object = {}): Promise<DataType<any>> {
+  return http.request(
+    "post",
+    `${VITE_PROXY_DOMAIN_REAL}admin/inventoryShoppingAdd`,
+    {
+      data
+    }
+  );
 }
-
-//按钮添加
-export async function httpActionAdd(data: object): Promise<DataType<Menu[]>> {
-  return http.request(`post`, `${VITE_PROXY_DOMAIN_REAL}admin/menuactionadd`, {
-    data
-  });
+//改
+export async function httpUpdate(data: object): Promise<DataType<any[]>> {
+  return http.request(
+    `post`,
+    `${VITE_PROXY_DOMAIN_REAL}admin/inventoryShoppingEdit`,
+    {
+      data
+    }
+  );
 }
 
-//按钮更新
-export async function httpActionUpdate(
-  data: object
-): Promise<DataType<Menu[]>> {
-  return http.request(`post`, `${VITE_PROXY_DOMAIN_REAL}admin/menuactionsave`, {
-    data
-  });
+//查详情
+export async function httpDetail(data: object): Promise<DataType<any[]>> {
+  return http.request(
+    `post`,
+    `${VITE_PROXY_DOMAIN_REAL}admin/inventoryShoppingRead`,
+    {
+      data
+    }
+  );
 }
-
-//按钮状态
-export async function httpActionStatus(
-  data: object
-): Promise<DataType<Menu[]>> {
+//查列表
+export async function httpList(data: object): Promise<DataType<any[]>> {
   return http.request(
     `post`,
-    `${VITE_PROXY_DOMAIN_REAL}admin/menuactionstatus`,
+    `${VITE_PROXY_DOMAIN_REAL}admin/inventoryShoppingList`,
     {
       data
     }
   );
 }
-
-//按钮删除
-export async function httpActionDel(data: object): Promise<DataType<Menu[]>> {
-  return http.request(`post`, `${VITE_PROXY_DOMAIN_REAL}admin/menuactiondel`, {
-    data
-  });
+//修改记录
+export async function httpLog(data: object): Promise<DataType<any[]>> {
+  return http.request(
+    `post`,
+    `${VITE_PROXY_DOMAIN_REAL}admin/inventoryShoppingLog`,
+    {
+      data
+    }
+  );
 }

src/api/operate/batchSetVideo.ts

@@ -5,37 +5,13 @@ const { VITE_PROXY_DOMAIN_REAL } = loadEnv();
 
 // 添加
 export async function httpAdd(data: object = {}): Promise<DataType<any>> {
-  return http.request("post", `${VITE_PROXY_DOMAIN_REAL}admin/companyAdd`, {
+  return http.request("post", `${VITE_PROXY_DOMAIN_REAL}admin/videoGroupAdd`, {
     data
   });
 }
 // 列表
 export async function httpList(data: object = {}): Promise<DataType<any>> {
-  return http.request("post", `${VITE_PROXY_DOMAIN_REAL}admin/companylist`, {
-    data
-  });
-}
-// 详情
-export async function httpDetail(data: object = {}): Promise<DataType<any>> {
-  return http.request("post", `${VITE_PROXY_DOMAIN_REAL}admin/companyRead`, {
-    data
-  });
-}
-// 更新
-export async function httpUpdate(data: object = {}): Promise<DataType<any>> {
-  return http.request("post", `${VITE_PROXY_DOMAIN_REAL}admin/companyEdit`, {
-    data
-  });
-}
-// 状态
-export async function httpStatus(data: object = {}): Promise<DataType<any>> {
-  return http.request("post", `${VITE_PROXY_DOMAIN_REAL}admin/companyChange`, {
-    data
-  });
-}
-// 删除
-export async function httpDelete(data: object = {}): Promise<DataType<any>> {
-  return http.request("post", `${VITE_PROXY_DOMAIN_REAL}admin/companyDelete`, {
+  return http.request("post", `${VITE_PROXY_DOMAIN_REAL}admin/videoGroupList`, {
     data
   });
 }

src/api/operate/setComGood.ts

@@ -5,37 +5,57 @@ const { VITE_PROXY_DOMAIN_REAL } = loadEnv();
 
 // 添加
 export async function httpAdd(data: object = {}): Promise<DataType<any>> {
-  return http.request("post", `${VITE_PROXY_DOMAIN_REAL}admin/groupAdd`, {
+  return http.request("post", `${VITE_PROXY_DOMAIN_REAL}admin/companyGoodAdd`, {
     data
   });
 }
 // 列表
 export async function httpList(data: object = {}): Promise<DataType<any>> {
-  return http.request("post", `${VITE_PROXY_DOMAIN_REAL}admin/groupList`, {
-    data
-  });
+  return http.request(
+    "post",
+    `${VITE_PROXY_DOMAIN_REAL}admin/companyGoodList`,
+    {
+      data
+    }
+  );
 }
 // 详情
 export async function httpDetail(data: object = {}): Promise<DataType<any>> {
-  return http.request("post", `${VITE_PROXY_DOMAIN_REAL}admin/groupRead`, {
-    data
-  });
+  return http.request(
+    "post",
+    `${VITE_PROXY_DOMAIN_REAL}admin/companyGoodRead`,
+    {
+      data
+    }
+  );
 }
 // 更新
 export async function httpUpdate(data: object = {}): Promise<DataType<any>> {
-  return http.request("post", `${VITE_PROXY_DOMAIN_REAL}admin/groupEdit`, {
-    data
-  });
+  return http.request(
+    "post",
+    `${VITE_PROXY_DOMAIN_REAL}admin/companyGoodEdit`,
+    {
+      data
+    }
+  );
 }
 // 状态
 export async function httpStatus(data: object = {}): Promise<DataType<any>> {
-  return http.request("post", `${VITE_PROXY_DOMAIN_REAL}admin/groupChange`, {
-    data
-  });
+  return http.request(
+    "post",
+    `${VITE_PROXY_DOMAIN_REAL}admin/companyGoodStatus`,
+    {
+      data
+    }
+  );
 }
 // 删除
 export async function httpDelete(data: object = {}): Promise<DataType<any>> {
-  return http.request("post", `${VITE_PROXY_DOMAIN_REAL}admin/groupDelete`, {
-    data
-  });
+  return http.request(
+    "post",
+    `${VITE_PROXY_DOMAIN_REAL}admin/companyGoodDelete`,
+    {
+      data
+    }
+  );
 }

src/api/operate/setTheme.ts

@@ -5,37 +5,31 @@ const { VITE_PROXY_DOMAIN_REAL } = loadEnv();
 
 // 添加
 export async function httpAdd(data: object = {}): Promise<DataType<any>> {
-  return http.request("post", `${VITE_PROXY_DOMAIN_REAL}admin/companyAdd`, {
+  return http.request("post", `${VITE_PROXY_DOMAIN_REAL}admin/themeAdd`, {
     data
   });
 }
 // 列表
 export async function httpList(data: object = {}): Promise<DataType<any>> {
-  return http.request("post", `${VITE_PROXY_DOMAIN_REAL}admin/companylist`, {
+  return http.request("post", `${VITE_PROXY_DOMAIN_REAL}admin/themeList`, {
     data
   });
 }
 // 详情
 export async function httpDetail(data: object = {}): Promise<DataType<any>> {
-  return http.request("post", `${VITE_PROXY_DOMAIN_REAL}admin/companyRead`, {
+  return http.request("post", `${VITE_PROXY_DOMAIN_REAL}admin/themeRead`, {
     data
   });
 }
 // 更新
 export async function httpUpdate(data: object = {}): Promise<DataType<any>> {
-  return http.request("post", `${VITE_PROXY_DOMAIN_REAL}admin/companyEdit`, {
+  return http.request("post", `${VITE_PROXY_DOMAIN_REAL}admin/themeEdit`, {
     data
   });
 }
 // 状态
 export async function httpStatus(data: object = {}): Promise<DataType<any>> {
-  return http.request("post", `${VITE_PROXY_DOMAIN_REAL}admin/companyChange`, {
-    data
-  });
-}
-// 删除
-export async function httpDelete(data: object = {}): Promise<DataType<any>> {
-  return http.request("post", `${VITE_PROXY_DOMAIN_REAL}admin/companyDelete`, {
+  return http.request("post", `${VITE_PROXY_DOMAIN_REAL}/admin/themeStatus`, {
     data
   });
 }

src/components/PageListModal/columns.tsx

@@ -0,0 +1,169 @@
+import { ref } from "vue";
+import dayjs from "dayjs";
+import { GOOD_OPTIONS } from "/@/config/status";
+import { renderImage, renderStatus } from "/@/utils/column-helper";
+// import { send_status_list } from "/@/utils/status";
+export function useColumns() {
+  const columns = ref([
+    {
+      type: "selection",
+      width: 30
+    },
+    {
+      label: "商品编号",
+      prop: "good_code",
+      width: 160,
+      showOverflowTooltip: true
+    },
+    {
+      label: "商品类型",
+      prop: "type",
+      width: 85,
+      showOverflowTooltip: true,
+      ...renderStatus(GOOD_OPTIONS, "type")
+    },
+    {
+      label: "图片",
+      prop: "good_cover_img",
+      width: 60,
+      showOverflowTooltip: true,
+      ...renderImage("good_cover_img")
+    },
+    {
+      label: "商品名称",
+      prop: "good_name",
+      minWidth: 160
+    },
+    {
+      label: "单位",
+      prop: "unit",
+      width: 80,
+      showOverflowTooltip: true
+    },
+    {
+      label: "起订量",
+      prop: "moq",
+      width: 80,
+      showOverflowTooltip: true
+    },
+    {
+      label: "步长",
+      prop: "step",
+      width: 80,
+      showOverflowTooltip: true
+    },
+    {
+      label: "售价",
+      prop: "price",
+      width: 110,
+      showOverflowTooltip: true
+    }
+  ]);
+
+  return {
+    columns
+  };
+}
+
+export const order_detail_columns = [
+  {
+    field: "sequenceNo",
+    label: "确认单编号"
+  },
+  {
+    field: "ownerName",
+    label: "销售员"
+  },
+  {
+    field: "department",
+    label: "平台名称"
+  },
+  {
+    field: "companyName",
+    label: "业务公司名称"
+  },
+  {
+    field: "customerName",
+    label: "客户名称"
+  },
+  {
+    field: "goodNum",
+    label: "商品数量"
+  },
+  {
+    field: "goodPrice",
+    label: "商品单价"
+  },
+  {
+    field: "goodName",
+    label: "商品名称"
+  },
+
+  {
+    field: "inv_fee",
+    label: "开票中"
+  },
+  {
+    field: "ainv_fee",
+    label: "已开票"
+  },
+  {
+    field: "winv_num",
+    label: "未开票数量"
+  },
+  {
+    field: "winv_fee",
+    label: "未开票"
+  }
+];
+
+/**
+ * @invoice_addr 公司注册地址
+ * @invoice_people  法人
+ * @invoice_mobile 联系方式
+ * @invoice_code 纳税识别号
+ * @invoice_bank 开户行
+ * @invoice_bankNo 开户账户
+ */
+export const convertInvoiceTitle = (title: Record<string, string>) => {
+  const { company_address, mobile, company_license, bank_name, bankNo } = title;
+
+  return {
+    invoice_addr: company_address,
+    invoice_mobile: mobile,
+    invoice_code: company_license,
+    invoice_bank: bank_name,
+    invoice_bankNo: bankNo
+  };
+};
+
+export const convertInvoiceTitleData = (title: Record<string, string>) => {
+  const {
+    invoice_addr,
+    invoice_mobile,
+    invoice_code,
+    invoice_bank,
+    invoice_bankNo
+  } = title;
+
+  return {
+    invoice_code,
+    addrAndmobile: invoice_addr + " " + invoice_mobile,
+    bankAndBankNo: invoice_bank + " " + invoice_bankNo
+  };
+};
+
+export const invoice_columns = [
+  {
+    label: "纳税人识别号",
+    field: "invoice_code"
+  },
+  {
+    label: "地址、电话",
+    field: "addrAndmobile"
+  },
+  {
+    label: "开户行及账号",
+    field: "bankAndBankNo"
+  }
+];

src/components/PageListModal/index.ts

@@ -0,0 +1,3 @@
+import pageListModal from "./pageListModal.vue";
+
+export default pageListModal;

src/components/PageListModal/pageListModal.vue

@@ -0,0 +1,178 @@
+<script setup lang="ts">
+import { reactive, ref, unref } from "vue";
+import { httpList } from "/@/api/parameter/good";
+import { httpList as httpGroupList } from "/@/api/operate/setComGood";
+
+import { PageSearch, usePageSearch } from "/@/components/PageSearch";
+import searchFormConfig from "./search.config";
+import { responseHandle } from "/@/utils/responseHandle";
+import { useNav } from "/@/layout/hooks/useNav";
+import { ElMessage } from "element-plus";
+import { useColumns } from "./columns";
+
+const { columns } = useColumns();
+const { logout } = useNav();
+const showModel = ref(false);
+const loading = ref(false);
+const dataList = ref([]);
+const tableRef = ref();
+const handleSelection = ref([]);
+const initform = {
+  page: 1,
+  size: 10
+};
+
+const pagination = reactive({
+  total: 0,
+  pageSize: 10,
+  currentPage: 1,
+  background: true
+});
+
+const emit = defineEmits(["reload", "save-btn-click"]);
+let otherParams: Record<any, any> = {};
+const ruleForm = ref({ ...initform });
+const group_id = ref("");
+const good_type = ref("");
+const { handleSearchClick, handleResetClick } = usePageSearch(
+  params => {
+    otherParams = params;
+    onSearch();
+
+    return {
+      result: {},
+      deleteProps: []
+    };
+  },
+  () => {
+    otherParams = {};
+    onSearch();
+  }
+);
+
+const handleCurrentChange = (current: number) => {
+  ruleForm.value.page = current;
+  onSearch();
+};
+
+function handleReset() {
+  ruleForm.value = { ...initform };
+  // handleResetClick();
+}
+
+async function show(_group_id, type = "") {
+  showModel.value = true;
+  group_id.value = _group_id;
+  good_type.value = type;
+
+  await onSearch();
+}
+
+function handleSelectionChange(val) {
+  handleSelection.value = val;
+}
+
+//列表展示
+async function onSearch() {
+  loading.value = true;
+  let res = {};
+  const model = {
+    group_id: group_id.value,
+    type: good_type.value,
+    status: "1",
+    ...otherParams,
+    ...ruleForm.value
+  };
+  if (group_id.value === "") {
+    res = await httpList(model);
+  } else {
+    res = await httpGroupList(model);
+  }
+  //
+  const { code, data, message } = res;
+
+  responseHandle({
+    code,
+    message,
+    logout,
+    handler: () => {
+      const { list, count } = data ?? {};
+      dataList.value = list ?? [];
+      pagination.total = count ?? 0;
+      pagination.pageSize = ruleForm.value.size;
+      pagination.currentPage = ruleForm.value.page;
+    }
+  });
+  loading.value = false;
+}
+
+function handleConfirm() {
+  const selectList = unref(handleSelection);
+  if (selectList.length === 0) return ElMessage.error("至少选择一个商品！");
+  emit("save-btn-click", selectList);
+  showModel.value = false;
+}
+
+defineExpose({
+  show
+});
+</script>
+
+<template>
+  <el-dialog
+    v-model="showModel"
+    :close-on-press-escape="false"
+    center
+    append-to-body
+    destroy-on-close
+    top="5vh"
+    title="添加商品"
+    :width="'1040px'"
+  >
+    <div relative>
+      <!-- <PageSearch
+        class="search"
+        @reset-btn-click="handleReset"
+        @search-btn-click="handleSearchClick"
+        :form-config="searchFormConfig"
+      /> -->
+      <div v-loading="loading">
+        <PureTable
+          ref="tableRef"
+          border
+          align="left"
+          row-key="id"
+          table-layout="auto"
+          :size="'small'"
+          :data="dataList"
+          :columns="columns"
+          :pagination="pagination"
+          :paginationSmall="true"
+          :header-cell-style="{ background: '#fafafa', color: '#606266' }"
+          @selection-change="handleSelectionChange"
+          @current-change="handleCurrentChange"
+        />
+      </div>
+
+      <el-button
+        absolute
+        bottom-0px
+        right="20px"
+        type="primary"
+        @click="handleConfirm"
+        size="small"
+        >保存</el-button
+      >
+    </div>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-pagination) {
+  justify-content: flex-start !important;
+}
+
+.search {
+  padding: 0px !important;
+}
+</style>

src/components/PageListModal/search.config.ts

@@ -0,0 +1,26 @@
+import { FormConfig } from "/@/components/PageSearch";
+// import { INV_OPEN_STATUS } from "/@/utils/details/inv-open";
+
+const searchFormConfig: FormConfig = {
+  colLayout: { span: 8 },
+  formItems: [
+    {
+      field: "status",
+      type: "input",
+      placeholder: "发票申请状态",
+      options: []
+    },
+    {
+      field: "inv_type",
+      type: "select",
+      placeholder: "发票类型"
+    },
+    {
+      field: "customer",
+      type: "input",
+      placeholder: "客户名称"
+    }
+  ]
+};
+
+export default searchFormConfig;

src/components/PageModalShell/src/page-modal.vue

@@ -38,6 +38,7 @@ defineExpose({
     :title="title"
     v-model="dialogVisible"
     center
+    top="8vh"
     destroy-on-close
     :width="width ? width : '1024px'"
   >

src/components/RemoteSelect/index.ts

@@ -3,6 +3,7 @@ import Company from "./src/search/Company.vue";
 import Card from "./src/search/Card.vue";
 import Unit from "./src/search/Unit.vue";
 import Video from "./src/search/Video.vue";
+import ComCard from "./src/search/ComCard.vue";
 
-export { Video, Card, Unit, Company };
+export { Video, Card, Unit, Company, ComCard };
 export default RemoteSelect;

src/components/RemoteSelect/src/remote-select.tsx

@@ -75,7 +75,8 @@ const RemoteSelect = defineComponent({
             ...item,
             label: item[responseLabelProp],
             value: item[responseValProp],
-            subLabel: item[subLabelProp]
+            subLabel: item[subLabelProp],
+            status: item.status + "" === "0"
           }));
 
           emit("listChange", unref(list));
@@ -118,6 +119,7 @@ const RemoteSelect = defineComponent({
             }
             key={item.value}
             value={item.value}
+            disabled={props.showDisabled ? item.status : false}
           >
             <span style="float: left">{item.label}</span>
 

src/components/RemoteSelect/src/search/ComCard.vue

@@ -0,0 +1,45 @@
+<script setup lang="ts">
+import { ref, watch } from "vue";
+import { useVModel } from "@vueuse/core";
+import { httpGroupList } from "/@/api/components/remoteSelect";
+import RemoteSelect from "../remote-select";
+
+const emit = defineEmits(["update:modelValue", "change"]);
+
+const props = defineProps<{
+  placeholder?: string;
+  modelValue?: string;
+  project_name?: string;
+  disabled?: boolean;
+}>();
+
+const remoteSelectRef = ref<any>(null);
+
+const value = useVModel(props, "modelValue");
+
+watch(
+  () => props.project_name,
+  project_name => {
+    if (!project_name && !remoteSelectRef.value) return;
+    remoteSelectRef.value.initalData({ project_name });
+  },
+  {
+    deep: true
+  }
+);
+</script>
+
+<template>
+  <RemoteSelect
+    v-model="value"
+    :api="httpGroupList"
+    :placeholder="placeholder"
+    :disabled="disabled"
+    ref="remoteSelectRef"
+    response-label-prop="combination"
+    response-val-prop="id"
+    request-prop="combination"
+    @item-change="val => emit('change', val)"
+    @inital="unit => (value = unit)"
+  />
+</template>

src/components/RemoteSelect/src/search/Video.vue

@@ -30,6 +30,7 @@ defineExpose({
     v-model="value"
     :api="httpVideoList"
     :placeholder="placeholder"
+    :showDisabled="true"
     ref="remoteSelectRef"
     response-label-prop="video_name"
     response-val-prop="id"

src/components/RemoteSelect/src/types.ts

@@ -31,6 +31,10 @@ export const RemoteSelectProps = {
     type: Boolean,
     default: false
   },
+  showDisabled: {
+    type: Boolean,
+    default: false
+  },
   prop: {
     type: String,
     default: () => "list"

src/config/btnList.ts

@@ -19,6 +19,8 @@ const btnList = [
   { code: "018", name: "页面导出" },
   { code: "019", name: "接口实时导出" },
   { code: "020", name: "接口预约导出" },
+  { code: "021", name: "置顶" },
+  { code: "022", name: "库存变动记录" },
   { code: "999", name: "批量设置采购单无需对账状态" }
 ];
 

src/config/status.ts

@@ -52,8 +52,8 @@ export const LEVEL_OPTIONS = [
   { id: "3", label: "普通角色", value: "3", type: "warning" }
 ];
 export const GOOD_OPTIONS = [
-  { id: "1", label: "商城商品", value: "1", type: "success" },
-  { id: "2", label: "兑换商品", value: "2", type: "primary" }
+  { id: "1", label: "兑换商品", value: "1", type: "success" },
+  { id: "2", label: "商城商品", value: "2", type: "primary" }
 ];
 
 export const BATCH_USER_OPTIONS = [
@@ -71,6 +71,15 @@ export const ORDER_OPTIONS = [
   { id: "1", label: "已发货", value: "1", type: "primary" },
   { id: "2", label: "已收货", value: "2", type: "success" }
 ];
+export const STYLE_OPTIONS = [
+  { id: "1", label: "样式1", value: "1", type: "primary" },
+  { id: "2", label: "样式2", value: "2", type: "success" }
+];
+export const JUMP_OPTIONS = [
+  { id: "1", label: "无跳转", value: "1", type: "warning" },
+  { id: "2", label: "内部跳转", value: "2", type: "primary" },
+  { id: "3", label: "外部跳转", value: "3", type: "success" }
+];
 
 export const POWERS = [
   "001",

src/layout/components/appMain.vue

@@ -144,6 +144,6 @@ const transitionMain = defineComponent({
 }
 
 .main-content {
-  margin: 24px;
+  padding: 24px;
 }
 </style>

src/views/mobile/exchangeStock/config/_details.ts

@@ -0,0 +1,439 @@
+/* eslint-disable prettier/prettier */
+import { h } from "vue";
+import { ElImage, ElTag } from "element-plus";
+import { DescriptionColumns } from "/@/components/BasicDescriptions";
+import { FormConfig } from "/@/components/PageSearch";
+import { createTooltip } from "/@/utils/tooltip";
+import { GOOD_OPTIONS } from "/@/config/status";
+// import { payWayOptions, sendWayOptions, supplyAreaOptions } from "./_options";
+
+export const projectFormConfig: FormConfig = {
+  labelWidth: "100px",
+  formItems: [
+    {
+      label: "公司卡类型",
+      field: "group_id",
+      placeholder: "公司卡类型",
+      span: 24,
+      slot: "group_id"
+    },
+    {
+      label: "商品信息",
+      field: "list",
+      type: "array",
+      placeholder: "商品信息",
+      span: 24,
+      slot: "list"
+    }
+  ]
+};
+
+//平台商品详情字段
+export const platformGoodColumns: DescriptionColumns = [
+  {
+    field: "good_name",
+    label: "商品名称",
+    span: 24,
+    render: (goodname, { skuCode, speclist }) => {
+      const goodName = speclist
+        ? speclist
+            .map(({ spec_name, spec_value }) => `${spec_name}[${spec_value}]`)
+            .join("_")
+        : "";
+
+      return createTooltip(
+        goodname + "_" + goodName,
+        "商品编号： " + skuCode,
+        360
+      );
+    }
+  },
+  {
+    field: "good_img",
+    label: "商品主图",
+    span: 12,
+    render: good_img => {
+      const previewSrcList = good_img ? good_img.split(",") : [];
+      return previewSrcList.map(src =>
+        h(ElImage, {
+          previewSrcList: [src],
+          src,
+          previewTeleported: true,
+          style: {
+            height: "20px",
+            width: "20px"
+          }
+        })
+      );
+    }
+  },
+  {
+    field: "good_info_img",
+    label: "商品详情图",
+    span: 12,
+    render: good_info_img => {
+      return h(ElImage, {
+        previewSrcList: [good_info_img],
+        src: good_info_img,
+        previewTeleported: true,
+        style: {
+          height: "20px",
+          width: "20px"
+        }
+      });
+    }
+  },
+  {
+    field: "company",
+    label: "业务企业名称",
+    span: 8,
+    render: (company, { companyNo }) =>
+      createTooltip(company, "业务企业编号: " + companyNo, 360)
+  },
+  {
+    field: "platform_name",
+    label: "所属平台",
+    span: 8
+  },
+  {
+    field: "brand_name",
+    label: "品牌",
+    span: 8
+  },
+  {
+    field: "cat_info",
+    label: "分类",
+    span: 8,
+    render(cat_info) {
+      return cat_info ? cat_info.map(({ name }) => name).join("_") : "";
+    }
+  },
+  {
+    field: "unit",
+    span: 8,
+    label: "单位"
+  },
+  {
+    field: "is_stock",
+    label: "是否库存品",
+    span: 6,
+    render(is_stock) {
+      return h(ElTag, null, {
+        default: () => (is_stock !== "0" ? "库存品" : "非库存品")
+      });
+    }
+  },
+  // {
+  //   field: "supply_area",
+  //   label: "供货区域",
+  //   span: 6,
+  //   render(supply_area) {
+  //     return h(ElTag, null, {
+  //       default: () =>
+  //         supplyAreaOptions.find(({ id }) => supply_area === id)?.label || "--"
+  //     });
+  //   }
+  // },
+  {
+    field: "good_type",
+    label: "是否定制",
+    span: 8,
+    render(good_type) {
+      return h(ElTag, null, {
+        default: () => (good_type !== "0" ? "是" : "否")
+      });
+    }
+  },
+  {
+    field: "tax",
+    label: "税点",
+    append: "%",
+    span: 4
+  },
+  {
+    field: "delivery_day",
+    label: "物流时间",
+    append: "天",
+    span: 4
+  },
+  {
+    field: "lead_time",
+    label: "供货周期",
+    append: "天",
+    span: 4
+  },
+  {
+    field: "sample_day",
+    label: "调样周期",
+    append: "天",
+    span: 4
+  },
+  {
+    field: "exclusive",
+    label: "专属类型",
+    span: 6,
+    render(exclusive) {
+      return exclusive ? exclusive.map(({ name }) => name).join("/") : "";
+    }
+  },
+  {
+    field: "weight",
+    label: "商品总克重",
+    append: "g",
+    span: 6
+  },
+  {
+    field: "noble",
+    label: "贵金属信息",
+    render(
+      _,
+      {
+        noble_weight,
+        noble_metal,
+        noble_name,
+        gold_price,
+        is_gold_price,
+        is_diff,
+        config,
+        other_config
+      }
+    ) {
+      if (!noble_metal) {
+        return "";
+      }
+
+      const weight = noble_weight ? `${noble_weight}g-${noble_name}` : "";
+
+      const price = gold_price ? gold_price : "0";
+
+      const isGoldPrice = is_gold_price === "0" ? "不" : "";
+
+      const diff = is_diff === "1" ? "有" : "无";
+
+      return `${weight}${price}元/g-${isGoldPrice}启用实时金价-${diff}工差-${config}-${other_config}`;
+    }
+  },
+  {
+    field: "delivery_place_cn",
+    label: "发货地",
+    span: 8
+  },
+  {
+    field: "customized",
+    label: "工期",
+    span: 8
+  },
+  {
+    field: "cgder",
+    label: "供应商负责人",
+    span: 4
+  },
+  {
+    field: "good_creater",
+    label: "商品创建人",
+    span: 4
+  },
+  {
+    field: "after_sales",
+    label: "售后说明",
+    span: 24
+  },
+  {
+    field: "good_remark",
+    label: "商品备注",
+    span: 24
+  },
+
+  {
+    field: "craft_desc",
+    label: "工艺说明",
+    span: 24
+  }
+];
+
+//采反商品详情字段
+export const commodityFeedbackColumns: DescriptionColumns = [
+  {
+    field: "good_name",
+    label: "商品名称",
+    span: 24,
+    render: (goodname, { spuCode, speclist }) => {
+      const goodName = speclist
+        ? speclist
+            .map(({ spec_name, spec_value }) => `${spec_name}[${spec_value}]`)
+            .join("_")
+        : "";
+
+      return createTooltip(
+        goodname + "_" + goodName,
+        "上线商品编号： " + spuCode,
+        360
+      );
+    }
+  },
+
+  {
+    field: "cat_info",
+    label: "分类",
+    span: 8,
+    render(cat_info) {
+      return cat_info ? cat_info.map(({ name }) => name).join("_") : "";
+    }
+  },
+
+  {
+    field: "brand_name",
+    label: "品牌",
+    span: 8
+  },
+
+  // {
+  //   field: "send_way",
+  //   label: "发货方式",
+  //   span: 8,
+  //   render(send_way) {
+  //     return h(ElTag, null, {
+  //       default: () =>
+  //         sendWayOptions.find(({ id }) => send_way === id)?.label || "--"
+  //     });
+  //   }
+  // },
+  {
+    field: "unit",
+    label: "单位",
+    span: 4
+  },
+  {
+    field: "tax",
+    label: "税点",
+    append: "%",
+    span: 4
+  },
+  // {
+  //   field: "pay_way",
+  //   label: "付款方式",
+  //   span: 4,
+  //   render(pay_way) {
+  //     return h(ElTag, null, {
+  //       default: () =>
+  //         payWayOptions.find(({ id }) => pay_way === id)?.label || "--"
+  //     });
+  //   }
+  // },
+
+  {
+    field: "weight",
+    label: "商品总克重",
+    append: "g",
+    span: 6
+  },
+
+  {
+    field: "addtime",
+    label: "反馈时间",
+    span: 6
+  },
+  {
+    field: "expire_day",
+    label: "竞价有效期",
+    append: "天",
+    span: 4
+  },
+
+  {
+    field: "delivery_day",
+    label: "物流时间",
+    append: "天",
+    span: 4
+  },
+  {
+    field: "work_day",
+    label: "生产工期",
+    append: "天",
+    span: 4
+  },
+  {
+    field: "cgder",
+    label: "供应商负责人",
+    span: 4
+  },
+  {
+    field: "creater",
+    label: "商品创建人",
+    span: 4
+  },
+  {
+    field: "supply_area",
+    label: "供货区域",
+    span: 4,
+    render(supply_area) {
+      return h(ElTag, null, {
+        default: () =>
+          supplyAreaOptions.find(({ id }) => supply_area === id)?.label || "--"
+      });
+    }
+  },
+
+  {
+    field: "good_img",
+    label: "商品图片",
+    span: 24,
+    render: good_img => {
+      const previewSrcList = good_img ? good_img.split(",") : [];
+      return previewSrcList.map(src =>
+        h(ElImage, {
+          previewSrcList: [src],
+          src,
+          previewTeleported: true,
+          style: {
+            height: "20px",
+            width: "20px"
+          }
+        })
+      );
+    }
+  },
+  {
+    field: "noble",
+    label: "贵金属信息",
+    span: 24,
+    render(
+      _,
+      {
+        noble_weight,
+        noble_metal,
+        noble_name,
+        gold_price,
+        is_gold_price,
+        is_diff,
+        config,
+        other_config
+      }
+    ) {
+      if (!noble_metal) {
+        return "--";
+      }
+
+      const weight = noble_weight ? `${noble_weight}g-${noble_name}` : "";
+
+      const price = gold_price ? gold_price : "0";
+
+      const isGoldPrice = is_gold_price === "0" ? "不" : "";
+
+      const diff = is_diff === "1" ? "有" : "无";
+
+      return `${weight}${price}元/g-${isGoldPrice}启用实时金价-${diff}工差-${config}-${other_config}`;
+    }
+  },
+
+  {
+    field: "cost_desc",
+    label: "工艺说明",
+    span: 24
+  },
+  {
+    field: "remark",
+    label: "采返备注",
+    span: 24
+  }
+];

src/views/mobile/exchangeStock/config/_rules.ts

@@ -0,0 +1,33 @@
+import { FormRules } from "element-plus";
+
+export const ladderFormRules: FormRules = {
+  key: {
+    trigger: "change",
+    required: true,
+    message: "请选择商品类型"
+  },
+  value: {
+    trigger: "change",
+    required: true,
+    message: "请选择单位"
+  }
+};
+
+export const projectFormRules: FormRules = {
+  group_id: {
+    trigger: "change",
+    required: true,
+    validator(_, value) {
+      if (value === "") return new Error("请选择卡类型");
+      return true;
+    }
+  },
+  list: {
+    trigger: "change",
+    required: true,
+    validator(_, value) {
+      if (value.length === 0) return new Error("至少选择一条商品信息！");
+      return true;
+    }
+  }
+};

src/views/mobile/exchangeStock/config/content.config.ts

@@ -1,7 +1,12 @@
 import { isString } from "@pureadmin/utils";
 import { h } from "vue";
 import { ContentConfig } from "/@/components/PageContent";
-import { httpDelete, httpStatus, httpList } from "/@/api/mobile/exchangeStock";
+import {
+  // httpDelete,
+  // httpStatus,
+  httpList,
+  httpAdd
+} from "/@/api/mobile/exchangeStock";
 import { renderStatus } from "/@/utils/column-helper";
 import { STATUS_OPTIONS } from "/@/config/status";
 import { ElTag } from "element-plus";
@@ -14,23 +19,20 @@ const columns = [
   },
   {
     prop: "id",
-    label: "ID",
-    width: "70px"
+    label: "ID"
   },
+
   {
-    prop: "status",
-    label: "状态",
-    minWidth: "90px",
-    ...renderStatus(STATUS_OPTIONS)
+    prop: "account_username",
+    label: "账户"
   },
   {
-    prop: "video_name",
-    label: "视频名称",
-    minWidth: "250px"
+    prop: "account_name",
+    label: "账户姓名"
   },
   {
-    prop: "remark",
-    label: "视频描述"
+    prop: "inventory",
+    label: "库存数"
   },
 
   {
@@ -50,7 +52,7 @@ const contentConfig: ContentConfig = {
   title: "卡类型管理",
   columns,
   apis: {
-    httpAdd: true,
+    httpAdd,
     // httpDelete,
     // httpStatus,
     httpList,

src/views/mobile/exchangeStock/cpns/addModel.vue

@@ -0,0 +1,368 @@
+<script setup lang="ts">
+import { computed, ref, watchEffect, reactive, unref } from "vue";
+import { ActionType } from "/@/components/PageContent";
+import { createBasicTitle } from "./utils/create-basic-title";
+import { ElForm, ElMessage } from "element-plus";
+import type { FormInstance, FormRules } from "element-plus";
+import { projectFormRules } from "../config/_rules";
+import { ComCard } from "/@/components/RemoteSelect";
+import { STATUS_OPTIONS } from "/@/config/status";
+import LadderTable from "./ladder-table.vue";
+import LadderModal from "./ladder-modal.vue";
+import { useNav } from "/@/layout/hooks/useNav";
+import OrderDialog from "/@/components/PageListModal";
+const { logout } = useNav();
+import { httpAdd, httpDetail, httpUpdate } from "/@/api/mobile/exchangeStock";
+const ladderModalRef = ref<InstanceType<typeof LadderModal>>(null);
+const modelRef = ref<InstanceType<typeof OrderDialog>>(null);
+const emit = defineEmits(["submitOk"]);
+const ruleFormRef = ref<FormInstance>();
+const form = {
+  id: "",
+  inventory: 0
+};
+const ruleForm = reactive({ ...form });
+const basicFormRef = ref<InstanceType<typeof ElForm>>(null);
+
+const type = ref<ActionType>("preview");
+const dialogVisible = ref(false);
+const confirmLoading = ref(false);
+const title = ref("");
+const uID = ref("");
+
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) return;
+  await formEl.validate(async (valid, fields) => {
+    if (valid) {
+      if (confirmLoading.value) return;
+
+      confirmLoading.value = true;
+      const { id, group_id, code } = ruleForm;
+      const model = {
+        id,
+        group_id,
+        code,
+        modular: []
+      };
+      for (let i = 1; i < 5; i++) {
+        let modela = {
+          type: ruleForm[`modular${i}_type`],
+          status: ruleForm[`modular${i}_status`],
+          title: i < 3 ? "" : ruleForm[`modular${i}_title`],
+          data: ruleForm[`modular${i}_data`]
+        };
+        // const data = JSON.parse(JSON.stringify(modela.data))
+        // da
+        model.modular.push(modela);
+      }
+      let res = {};
+      if (type.value == "create") {
+        delete model["id"];
+        res = await httpAdd(model);
+      } else {
+        res = await httpUpdate(model);
+      }
+      const { code: hcode, data, message } = res;
+      confirmLoading.value = false;
+      if (hcode === 0) {
+        dialogVisible.value = false;
+        emit("submitOk", {});
+      } else if (hcode >= 100 && hcode <= 104) {
+        logout();
+      } else {
+        ElMessage.warning(message);
+      }
+    } else {
+      console.log("error submit!", fields);
+    }
+  });
+};
+
+async function handlePush(_ladder, index, type) {
+  console.log(ruleForm);
+  ruleForm[`modular${type}_data`].push(_ladder);
+}
+
+function modularShow() {
+  if (!ruleForm.group_id) return ElMessage.warning("请选择公司卡类型！");
+  modelRef.value.show("");
+}
+async function handleUpdate(_ladder, index, type) {
+  ruleForm[`modular${type}_data`][index] = _ladder;
+}
+function handleAddOrder(list) {
+  console.log(list);
+  list.forEach(item => {
+    const { id } = item;
+    let findex = ruleForm.modular3_data.findIndex(e => e.id + "" == id + "");
+    if (findex == -1) {
+      let model = Object.assign(item, {
+        img: item.good_cover_img,
+        good_id: item.id,
+        jump_type: "2",
+        jump_param: `/good?id=${item.id}`,
+        style_type: "",
+        title: ""
+      });
+      ruleForm.modular3_data.push(model);
+    }
+  });
+}
+const initData = async () => {
+  if (confirmLoading.value) return;
+  confirmLoading.value = true;
+  const { code, data, message } = await httpDetail({ id: uID.value });
+  if (code === 0) {
+    const { id, code, group_id, modular } = data;
+    ruleForm.id = id;
+    ruleForm.code = code;
+    ruleForm.group_id = group_id;
+    modular.forEach(item => {
+      const { type } = item;
+      ruleForm[`modular${type}_type`] = type + "";
+      ruleForm[`modular${type}_status`] = item?.status + "" || "";
+      ruleForm[`modular${type}_title`] = item?.title + "" || "";
+      ruleForm[`modular${type}_data`] = item?.data || [];
+    });
+  } else if (code >= 100 && code <= 104) {
+    logout();
+  } else {
+    ElMessage.warning(message);
+  }
+  confirmLoading.value = false;
+};
+defineExpose({
+  onShow: async (basicTitle: string, readonly: ActionType, id: string) => {
+    type.value = readonly;
+    const readTitle = createBasicTitle(type.value);
+    title.value =
+      readonly == "preview" ? basicTitle + readTitle : readTitle + basicTitle;
+    Object.keys(ruleForm).forEach(key => {
+      ruleForm[key] = form[key];
+    });
+    dialogVisible.value = true;
+    confirmLoading.value = false;
+    uID.value = id;
+    if (type.value !== "create") {
+      await initData();
+    }
+  }
+});
+</script>
+
+<template>
+  <el-dialog
+    :title="title"
+    v-model="dialogVisible"
+    center
+    top="5vh"
+    destroy-on-close
+    width="1024px"
+  >
+    <el-form
+      ref="ruleFormRef"
+      v-loading="confirmLoading"
+      :model="ruleForm"
+      :rules="projectFormRules"
+      label-width="100px"
+      :disabled="type === 'preview'"
+      status-icon
+    >
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="主题编号" prop="code">
+            <el-input v-model="ruleForm.code" placeholder="主题编号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="16">
+          <el-form-item label="公司卡类型" prop="group_id">
+            <ComCard v-model="ruleForm.group_id" placeholder="公司卡类型" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="轮播区域" prop="modular1_status">
+                <el-select
+                  v-model="ruleForm.modular1_status"
+                  placeholder="是否使用"
+                  style="width: 100%"
+                >
+                  <el-option
+                    v-for="(item, index) in STATUS_OPTIONS"
+                    :label="item.label"
+                    :value="item.id"
+                    :key="item.id + index"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <el-form-item
+                label="数据"
+                label-width="60px"
+                prop="modular1_data"
+              >
+                <LadderTable
+                  :readonly="type === 'preview'"
+                  :type="1"
+                  :ladder="ruleForm.modular1_data"
+                  @delete="index => ruleForm.modular1_data.splice(index, 1)"
+                  @choose="() => ladderModalRef.onDisplay(0, '1')"
+                  @update="
+                    ({ data, index }) =>
+                      ladderModalRef.onDisplay(index, '1', data)
+                  "
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-col>
+
+        <el-col :span="24">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="产品宣传" prop="modular2_status">
+                <el-select
+                  v-model="ruleForm.modular2_status"
+                  style="width: 100%"
+                  placeholder="是否使用"
+                >
+                  <el-option
+                    v-for="(item, index) in STATUS_OPTIONS"
+                    :label="item.label"
+                    :value="item.id"
+                    :key="item.id + index"
+                  />
+                </el-select>
+              </el-form-item>
+              <!-- <el-form-item label="区域名称" prop="modular2_title">
+                <el-input v-model="ruleForm.modular2_title" />
+              </el-form-item> -->
+            </el-col>
+            <el-col :span="16">
+              <el-form-item
+                label="数据"
+                label-width="60px"
+                prop="modular2_data"
+              >
+                <LadderTable
+                  :readonly="type === 'preview'"
+                  :type="2"
+                  :ladder="ruleForm.modular2_data"
+                  @delete="index => ruleForm.modular2_data.splice(index, 1)"
+                  @choose="() => ladderModalRef.onDisplay(0, '2')"
+                  @update="
+                    ({ data, index }) =>
+                      ladderModalRef.onDisplay(index, '2', data)
+                  "
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="24">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="产品展示" prop="modular3_status">
+                <el-select
+                  v-model="ruleForm.modular3_status"
+                  style="width: 100%"
+                  placeholder="是否使用"
+                >
+                  <el-option
+                    v-for="(item, index) in STATUS_OPTIONS"
+                    :label="item.label"
+                    :value="item.id"
+                    :key="item.id + index"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="区域名称" prop="modular3_title">
+                <el-input
+                  v-model="ruleForm.modular3_title"
+                  placeholder="区域名称"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <el-form-item
+                label="数据"
+                label-width="60px"
+                prop="modular3_data"
+              >
+                <LadderTable
+                  :readonly="type === 'preview'"
+                  :type="3"
+                  :ladder="ruleForm.modular3_data"
+                  @delete="index => ruleForm.modular3_data.splice(index, 1)"
+                  @choose="() => modularShow()"
+                  @update="
+                    ({ data, index }) =>
+                      ladderModalRef.onDisplay(index, '3', data)
+                  "
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="24">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="产品优势" prop="modular4_status">
+                <el-select
+                  v-model="ruleForm.modular4_status"
+                  style="width: 100%"
+                  placeholder="是否使用"
+                >
+                  <el-option
+                    v-for="(item, index) in STATUS_OPTIONS"
+                    :label="item.label"
+                    :value="item.id"
+                    :key="item.id + index"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="区域名称" prop="modular4_title">
+                <el-input
+                  v-model="ruleForm.modular4_title"
+                  placeholder="区域名称"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <el-form-item
+                label="数据"
+                label-width="60px"
+                prop="modular4_data"
+              >
+                <LadderTable
+                  :readonly="type === 'preview'"
+                  :type="4"
+                  :ladder="ruleForm.modular4_data"
+                  @delete="index => ruleForm.modular4_data.splice(index, 1)"
+                  @choose="() => ladderModalRef.onDisplay(0, '4')"
+                  @update="
+                    ({ data, index }) =>
+                      ladderModalRef.onDisplay(index, '4', data)
+                  "
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-col>
+      </el-row>
+
+      <el-form-item v-if="type !== 'preview'">
+        <div class="w-full flex justify-end">
+          <el-button type="primary" @click="submitForm(ruleFormRef)"
+            >提交</el-button
+          >
+          <ElButton @click="() => (dialogVisible = false)">取消</ElButton>
+        </div>
+      </el-form-item>
+    </el-form>
+  </el-dialog>
+  <LadderModal ref="ladderModalRef" @update="handleUpdate" @push="handlePush" />
+  <OrderDialog ref="modelRef" @save-btn-click="handleAddOrder" />
+</template>

src/views/mobile/exchangeStock/cpns/ladder-table.vue

@@ -0,0 +1,88 @@
+<script setup lang="ts">
+import { useRenderIcon } from "/@/components/ReIcon/src/hooks";
+import { GOOD_OPTIONS } from "/@/config/status";
+const emit = defineEmits(["choose", "delete", "update"]);
+
+defineProps<{
+  ladder: Record<string, any>[];
+  readonly: boolean;
+}>();
+</script>
+
+<template>
+  <ElTable size="small" border :data="ladder" max-height="500px">
+    <ElTableColumn prop="name" label="顺序" width="110px" fixed="left">
+      <template #="{ $index }">
+        {{ $index + 1 }}
+      </template>
+    </ElTableColumn>
+
+    <ElTableColumn prop="type" label="商品类型" width="110px">
+      <template #="{ row }">
+        <ElTag>{{
+          GOOD_OPTIONS.find(({ id }) => id === row.type + "")?.label || "--"
+        }}</ElTag>
+      </template>
+    </ElTableColumn>
+    <ElTableColumn prop="good_cover_img" width="60" label="图片">
+      <template #="{ row }">
+        <ElImage
+          :src="row.good_cover_img"
+          fit="cover"
+          lazy
+          :preview-src-list="
+            row.good_cover_img !== '' ? [row.good_cover_img] : []
+          "
+          z-index="99999"
+          preview-teleported
+        />
+      </template>
+    </ElTableColumn>
+    <ElTableColumn prop="good_name" label="商品名称" />
+    <ElTableColumn prop="inventory" label="添加库存数" width="150px">
+      <template #="{ row }">
+        <el-input-number
+          v-model="row.inventory"
+          :step="1"
+          :min="0"
+          :precision="0"
+          size="small"
+          :max="99999999"
+          value-on-clear="min"
+          controls-position="right"
+          step-strictly
+        />
+      </template>
+    </ElTableColumn>
+    <ElTableColumn prop="unit" label="单位" width="80px" />
+    <ElTableColumn prop="moq" label="起订量" width="80px" />
+    <ElTableColumn prop="step" label="步长" width="80px" />
+    <ElTableColumn prop="price" label="售价" width="110px" />
+    <!-- v-if="!readonly" -->
+    <ElTableColumn width="80px" fixed="right">
+      <template #header>
+        <div class="w-full flex justify-between">
+          <p>操作</p>
+
+          <ElTooltip content="添加" placement="top">
+            <ElButton
+              link
+              :icon="useRenderIcon('add')"
+              @click="() => emit('choose')"
+            />
+          </ElTooltip>
+        </div>
+      </template>
+
+      <template #="{ $index, row }">
+        <ElButton
+          text
+          type="primary"
+          size="small"
+          @click="() => emit('delete', $index)"
+          >删除</ElButton
+        >
+      </template>
+    </ElTableColumn>
+  </ElTable>
+</template>

src/views/mobile/exchangeStock/index.vue

@@ -1,52 +1,160 @@
 <script setup lang="ts">
-import { usePageSearch } from "/@/components/PageSearch";
+import { PageSearch, usePageSearch } from "/@/components/PageSearch";
 import searchConfig from "./config/search.config";
 import contentConfig from "./config/content.config";
-import PageAuth from "/@/components/PageAuth";
-import { PageModal, usePageModal } from "/@/components/PageModal";
+// import PageAuth from "/@/components/PageAuth";
+import { PageModal, usePageModal } from "/@/components/PageModalShell";
 import modalConfig from "./config/modal.config";
-import { useRouter } from "vue-router";
-import PageContainer, {
-  type Events,
-  type Hooks
-} from "/@/components/PageContainer";
-
-const pageName = "stock";
-const basePath = "/sellOut/projectDetail";
-// , handleResetClick, handleSearchClick
-const { pageContentRef } = usePageSearch();
-const { push } = useRouter();
-const hooks: Hooks = {
-  pageSearchHook: () => usePageSearch(undefined, undefined, searchConfig)
-};
+import { PageContent } from "/@/components/PageContent";
+import type { PageContentInstance } from "/@/components/PageContent";
+import { projectFormConfig } from "./config/_details";
+import { projectFormRules } from "./config/_rules";
+import {
+  BasicForm,
+  transform,
+  createDefaultData
+} from "/@/components/BasicForm";
+import { ref, unref } from "vue";
+// import dayjs from "dayjs";
+import { useResponseHandle } from "/@/hooks/useAsync";
+// import OrderDialog from "/@/components/PageListModal";
+import LadderModal from "./cpns/ladder-modal.vue";
+import LadderTable from "./cpns/ladder-table.vue";
+import { ComCard } from "/@/components/RemoteSelect";
+import OrderDialog from "/@/components/PageListModal";
+import { ElForm, ElMessage } from "element-plus";
+const responseHandle = useResponseHandle();
+const ladderModalRef = ref<InstanceType<typeof LadderModal>>(null);
+const pageContentRef = ref<PageContentInstance | null>(null);
+const modelRef = ref<InstanceType<typeof OrderDialog>>(null);
 const {
   pageModalRef,
-  // handleUpdateData,
+  handleUpdateData,
   handleCreateData,
   handlePreviewData,
   handleConfrim,
   defaultInfo
-} = usePageModal({ pageContentRef });
-const events: Events = {
-  content: {
-    preview: row => handlePreviewData(row)
+} = usePageModal({
+  pageContentRef
+});
+const { handleResetClick, handleSearchClick } = usePageSearch();
+const { formItems } = projectFormConfig;
+// const modelRef = ref<InstanceType<typeof OrderDialog>>(null);
+const basicFormRef = ref<InstanceType<typeof ElForm>>(null);
+const formData = ref<Record<string, any>>(createDefaultData(formItems));
+function handleCreate() {
+  basicFormRef.value.validate(isValid => {
+    if (!isValid) return;
+    const { group_id, list } = formData.value;
+    const params = {
+      group_id,
+      list: []
+    };
+    let isok = true;
+    list.forEach(item => {
+      const num = Number(item.inventory ?? "");
+      const model = {
+        good_id: item.id,
+        inventory: num
+      };
+      params.list.push(model);
+      if (num === 0) {
+        isok = false;
+      }
+    });
+    if (!isok) {
+      ElMessage.warning("库存数不能为空！");
+      return;
+    }
+    console.log(list);
+    // const params = unref(formData);
+
+    handleConfrim("create", params);
+    // emit("create", params);
+  });
+}
+
+async function handleDetailData(id, type) {
+  if (type === "preview") {
+    // handlePreviewData(data);
+  }
+  if (type === "update") {
+    // handleUpdateData(data);
   }
-};
+}
+function modularShow() {
+  if (!formData.value.group_id) return ElMessage.warning("请选择公司卡类型！");
+  modelRef.value.show(formData.value.group_id, "1");
+}
+function handleAddOrder(list) {
+  console.log(list);
+  list.forEach(item => {
+    const { id } = item;
+    let findex = formData.value.list.findIndex(e => e.id + "" == id + "");
+    if (findex == -1) {
+      let model = Object.assign(item, {
+        img: item.good_cover_img,
+        good_id: item.id,
+        jump_type: "2",
+        jump_param: `/good?id=${item.id}`,
+        style_type: "",
+        title: ""
+      });
+      formData.value.list.push(model);
+    }
+  });
+}
 </script>
 
 <template>
   <!-- <PageAuth :pageName="pageName"> -->
-  <PageContainer
-    :hooks="hooks"
-    :events="events"
-    :search-config="searchConfig"
+  <PageSearch
+    :form-config="searchConfig"
+    @search-btn-click="handleSearchClick"
+    @reset-btn-click="handleResetClick"
+  />
+  <PageContent
+    ref="pageContentRef"
     :content-config="contentConfig"
+    @create-btn-click="handleCreateData"
+    @preview-btn-click="({ id }) => handleDetailData(id, 'preview')"
+    @update-btn-click="({ id }) => handleDetailData(id, 'update')"
   />
   <PageModal
     ref="pageModalRef"
     :modal-config="modalConfig"
     :default-info="defaultInfo"
     @confirm-btn-click="handleConfrim"
-  />
+  >
+    <BasicForm
+      ref="basicFormRef"
+      v-bind="projectFormConfig"
+      :form-data="formData"
+      :rules="projectFormRules"
+      :disabled="false"
+      label-width="120px"
+    >
+      <template #group_id>
+        <ComCard v-model="formData.group_id" placeholder="公司卡类型" />
+      </template>
+
+      <template #list>
+        <LadderTable
+          :readonly="false"
+          :ladder="formData.list"
+          @choose="() => modularShow()"
+          @update="({ data, index }) => ladderModalRef.onDisplay(data, index)"
+          @delete="index => formData.list.splice(index, 1)"
+        />
+      </template>
+      <template #footer>
+        <div class="w-full flex justify-end">
+          <ElButton type="primary" @click="handleCreate">保存</ElButton>
+        </div>
+      </template>
+    </BasicForm>
+  </PageModal>
+
+  <OrderDialog ref="modelRef" @save-btn-click="handleAddOrder" />
   <!-- </PageAuth> -->
 </template>

src/views/mobile/serviceOrder/config/content.config.ts

@@ -0,0 +1,60 @@
+import { isString } from "@pureadmin/utils";
+import { h } from "vue";
+import { ContentConfig } from "/@/components/PageContent";
+import { httpDelete, httpStatus, httpList } from "/@/api/mobile/serviceOrder";
+import { renderStatus } from "/@/utils/column-helper";
+import { STATUS_OPTIONS } from "/@/config/status";
+import { ElTag } from "element-plus";
+
+const columns = [
+  {
+    type: "selection",
+    width: 55,
+    hide: ({ checkList }) => !checkList.includes("勾选列")
+  },
+  {
+    prop: "id",
+    label: "ID",
+    width: "70px"
+  },
+  {
+    prop: "status",
+    label: "状态",
+    minWidth: "90px",
+    ...renderStatus(STATUS_OPTIONS)
+  },
+  {
+    prop: "video_name",
+    label: "视频名称",
+    minWidth: "250px"
+  },
+  {
+    prop: "remark",
+    label: "视频描述"
+  },
+
+  {
+    prop: "addtime",
+    label: "创建时间",
+    minWidth: "160px"
+  },
+
+  {
+    label: "操作",
+    fixed: "right",
+    width: 120,
+    slot: "operation"
+  }
+];
+const contentConfig: ContentConfig = {
+  title: "账号管理",
+  columns,
+  apis: {
+    httpDelete,
+    httpStatus,
+    httpList
+  },
+  notPreview: false
+};
+
+export default contentConfig;

src/views/mobile/serviceOrder/config/modal.config.ts

@@ -0,0 +1,64 @@
+import { ModalConfig } from "/@/components/PageModal/src/types";
+import { isLicense } from "/@/utils/validate";
+
+const modalConfig: ModalConfig = {
+  title: "视频",
+  colLayout: { span: 24 },
+  itemStyle: {},
+  contact: "invoice_mobile",
+  formItems: [
+    {
+      field: "video_sn",
+      type: "input",
+      label: "视频编号",
+      isHidden: true,
+      labelWidth: "120px",
+      placeholder: "视频编号"
+    },
+
+    {
+      field: "nickname",
+      type: "input",
+      label: "视频名称",
+      labelWidth: "120px",
+      placeholder: "视频名称",
+      rules: [{ required: true, trigger: "change", message: "请输入视频名称" }]
+    },
+    {
+      field: "mobile",
+      type: "input",
+      label: "视频链接",
+      labelWidth: "120px",
+      placeholder: "视频链接",
+      rules: [{ required: true, trigger: "change", message: "请输入视频链接" }]
+    },
+    {
+      field: "remark",
+      type: "input",
+      label: "视频描述",
+      labelWidth: "120px",
+      placeholder: "视频描述",
+      rules: [{ required: true, trigger: "change", message: "请输入视频描述" }]
+    },
+    {
+      field: "video_img",
+      type: "img_upload",
+      label: "视频封面",
+      labelWidth: "120px",
+      placeholder: "视频封面",
+      rules: [
+        { required: true, trigger: "change", message: "请上传视频封面！" }
+      ]
+    },
+    {
+      field: "video_set",
+      type: "input",
+      label: "视频设置",
+      labelWidth: "120px",
+      isHidden: true,
+      placeholder: "视频设置"
+    }
+  ]
+};
+
+export default modalConfig;

src/views/mobile/serviceOrder/config/search.config.ts

@@ -0,0 +1,31 @@
+import { FormConfig } from "/@/components/PageSearch";
+import { STATUS_OPTIONS } from "/@/config/status";
+import { convertOptions } from "/@/utils/column-helper";
+
+const searchFormConfig: FormConfig = {
+  formItems: [
+    {
+      field: "status",
+      type: "select",
+      placeholder: "视频状态",
+      options: convertOptions(STATUS_OPTIONS)
+    },
+    {
+      field: "video_name",
+      type: "input",
+      placeholder: "视频名称"
+    },
+    {
+      field: "video_url",
+      type: "input",
+      placeholder: "视频地址"
+    },
+    {
+      field: "video_sn",
+      type: "input",
+      placeholder: "视频编号"
+    }
+  ]
+};
+
+export default searchFormConfig;

src/views/mobile/serviceOrder/index.vue

@@ -0,0 +1,53 @@
+<script setup lang="ts">
+import { usePageSearch } from "/@/components/PageSearch";
+import searchConfig from "./config/search.config";
+import contentConfig from "./config/content.config";
+import PageAuth from "/@/components/PageAuth";
+import { PageModal, usePageModal } from "/@/components/PageModal";
+import modalConfig from "./config/modal.config";
+import { useRouter } from "vue-router";
+import PageContainer, {
+  type Events,
+  type Hooks
+} from "/@/components/PageContainer";
+
+const pageName = "order";
+const basePath = "/sellOut/projectDetail";
+// , handleResetClick, handleSearchClick
+const { pageContentRef } = usePageSearch();
+const { push } = useRouter();
+const hooks: Hooks = {
+  pageSearchHook: () => usePageSearch(undefined, undefined, searchConfig)
+};
+const {
+  pageModalRef,
+  // handleUpdateData,
+  handleCreateData,
+  handlePreviewData,
+  handleConfrim,
+  defaultInfo
+} = usePageModal({ pageContentRef });
+const events: Events = {
+  content: {
+    preview: row => handlePreviewData(row),
+    create: row => handleCreateData(row)
+  }
+};
+</script>
+
+<template>
+  <PageAuth :pageName="pageName">
+    <PageContainer
+      :hooks="hooks"
+      :events="events"
+      :search-config="searchConfig"
+      :content-config="contentConfig"
+    />
+    <PageModal
+      ref="pageModalRef"
+      :modal-config="modalConfig"
+      :default-info="defaultInfo"
+      @confirm-btn-click="handleConfrim"
+    />
+  </PageAuth>
+</template>

src/views/operate/batchCreatUser/index.vue

@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { ref, unref } from "vue";
 import { PageSearch, usePageSearch } from "/@/components/PageSearch";
 import searchConfig from "./config/search.config";
 import contentConfig from "./config/content.config";
@@ -16,7 +17,7 @@ import {
   createDefaultData
 } from "/@/components/BasicForm";
 import { ElForm } from "element-plus";
-import { ref, unref } from "vue";
+
 import dayjs from "dayjs";
 // import { httpDetail } from "/@/api/parameter/video";
 const pageContentRef = ref<PageContentInstance | null>(null);

src/views/operate/batchSetVideo/config/_details.ts

@@ -0,0 +1,22 @@
+/* eslint-disable prettier/prettier */
+import { FormConfig } from "/@/components/PageSearch";
+export const projectFormConfig: FormConfig = {
+  labelWidth: "85px",
+  formItems: [
+    {
+      label: "公司卡类型",
+      field: "group_id",
+      placeholder: "公司卡类型",
+      span: 24,
+      slot: "group_id"
+    },
+    {
+      label: "直播视频",
+      field: "video_ids",
+      placeholder: "直播视频",
+      span: 24,
+      type: "array",
+      slot: "video_ids"
+    }
+  ]
+};

src/views/operate/batchSetVideo/config/_rules.ts

@@ -0,0 +1,13 @@
+import { FormRules } from "element-plus";
+export const projectFormRules: FormRules = {
+  group_id: {
+    trigger: "change",
+    required: true,
+    message: "请选择公司卡类型"
+  },
+  video_ids: {
+    trigger: "change",
+    required: true,
+    message: "请选择直播视频"
+  }
+};

src/views/operate/batchSetVideo/config/content.config.ts

@@ -1,13 +1,5 @@
 import { ContentConfig } from "/@/components/PageContent";
-import {
-  httpList,
-  httpAdd,
-  httpUpdate,
-  httpStatus,
-  httpDelete
-} from "/@/api/operate/batchSetVideo";
-import { renderStatus } from "/@/utils/column-helper";
-import { STATUS_OPTIONS } from "/@/config/status";
+import { httpList, httpAdd } from "/@/api/operate/batchSetVideo";
 
 const columns = [
   {
@@ -15,52 +7,36 @@ const columns = [
     width: 55,
     hide: ({ checkList }) => !checkList.includes("勾选列")
   },
-
   {
-    prop: "id",
-    label: "ID"
+    type: "expand",
+    slot: "expand"
   },
   {
-    prop: "title",
-    label: "卡类型"
-  },
-
-  {
-    prop: "status",
-    label: "状态",
-    ...renderStatus(STATUS_OPTIONS)
+    prop: "code",
+    label: "记录编码"
   },
   {
-    prop: "contacts",
-    label: "联系人"
+    prop: "company_title",
+    label: "公司名称"
   },
   {
-    prop: "mobile",
-    label: "联系方式"
+    prop: "card_title",
+    label: "卡类型"
   },
+
   {
     prop: "addtime",
     label: "创建时间",
     sortable: true
-  },
-
-  {
-    label: "操作",
-    fixed: "right",
-    width: 160,
-    slot: "operation"
   }
 ];
 
 const contentConfig: ContentConfig = {
-  title: "商品管理",
+  title: "批量设置视频",
   columns,
   apis: {
     httpAdd,
-    httpList,
-    httpUpdate,
-    httpStatus,
-    httpDelete
+    httpList
   }
 };
 

src/views/operate/batchSetVideo/config/search.config.ts

@@ -5,25 +5,30 @@ import { convertOptions } from "/@/utils/column-helper";
 const searchFormConfig: FormConfig = {
   formItems: [
     {
-      field: "status",
-      type: "select",
-      placeholder: "状态",
-      options: convertOptions(STATUS_OPTIONS)
+      field: "timer",
+      type: "date_picker",
+      otherOptions: {
+        type: "daterange",
+        startProp: "start_date",
+        endProp: "end_date",
+        startPlaceholder: "开始时间",
+        endPlaceholder: "结束时间"
+      }
     },
     {
-      field: "title",
+      field: "company_title",
       type: "input",
       placeholder: "企业名称"
     },
     {
-      field: "contacts",
+      field: "card_title",
       type: "input",
-      placeholder: "联系人"
+      placeholder: "卡类型"
     },
     {
-      field: "mobile",
+      field: "code",
       type: "input",
-      placeholder: "联系方式"
+      placeholder: "编码"
     }
   ]
 };

src/views/operate/batchSetVideo/index.vue

@@ -1,15 +1,28 @@
 <script setup lang="ts">
-import { ref } from "vue";
+import { ref, unref } from "vue";
+import { ElForm } from "element-plus";
 import { PageSearch, usePageSearch } from "/@/components/PageSearch";
 import searchConfig from "./config/search.config";
 import contentConfig from "./config/content.config";
 import modalConfig from "./config/modal.config";
-import { PageModal, usePageModal } from "/@/components/PageModal";
+import { PageModal, usePageModal } from "/@/components/PageModalShell";
 import { PageContent } from "/@/components/PageContent";
-
+import { ComCard } from "/@/components/RemoteSelect";
 import type { PageContentInstance } from "/@/components/PageContent";
+import { projectFormConfig } from "./config/_details";
+import { projectFormRules } from "./config/_rules";
+import {
+  BasicForm,
+  transform,
+  createDefaultData
+} from "/@/components/BasicForm";
+import { Video } from "/@/components/RemoteSelect";
+const { formItems } = projectFormConfig;
 const pageContentRef = ref<PageContentInstance | null>(null);
+const formData = ref<Record<string, any>>(createDefaultData(formItems));
+const basicFormRef = ref<InstanceType<typeof ElForm>>(null);
 const pageName = "batchSetVideo";
+const Video_id = ref("");
 const {
   pageModalRef,
   handleUpdateData,
@@ -21,6 +34,32 @@ const {
   pageContentRef
 });
 const { handleResetClick, handleSearchClick } = usePageSearch();
+function handleCreate() {
+  basicFormRef.value.validate(isValid => {
+    if (!isValid) return;
+    const { video_ids } = formData.value;
+    const params = unref(formData);
+    let arr = [];
+    video_ids.forEach(item => {
+      arr.push(item.id);
+    });
+    params.video_ids = arr;
+    handleConfrim("create", params);
+  });
+}
+function videoChange(e) {
+  if (e) {
+    const { id, video_name } = e;
+    console.log(e);
+    console.log(formData);
+    const index = formData.value.video_ids.findIndex(
+      e => e.id + "" === id + ""
+    );
+    if (index == -1) {
+      formData.value.video_ids.push({ id, video_name });
+    }
+  }
+}
 </script>
 
 <template>
@@ -34,14 +73,68 @@ const { handleResetClick, handleSearchClick } = usePageSearch();
     ref="pageContentRef"
     :content-config="contentConfig"
     @create-btn-click="handleCreateData"
-    @preview-btn-click="row => handlePreviewData(row)"
-    @update-btn-click="row => handleUpdateData(row)"
-  />
+  >
+    <template #expand="{ video_name }">
+      <div style="padding: 5px 55px">
+        <el-tag
+          v-for="(tag, index) in video_name"
+          disable-transitions
+          :key="tag + index"
+          size="mini"
+        >
+          {{ tag }}
+        </el-tag>
+      </div>
+    </template>
+  </PageContent>
   <PageModal
     ref="pageModalRef"
     :modal-config="modalConfig"
     :default-info="defaultInfo"
     @confirm-btn-click="handleConfrim"
-  />
+  >
+    <BasicForm
+      ref="basicFormRef"
+      v-bind="projectFormConfig"
+      :form-data="formData"
+      :rules="projectFormRules"
+      :disabled="false"
+      label-width="120px"
+    >
+      <template #group_id>
+        <ComCard v-model="formData.group_id" placeholder="公司卡类型" />
+      </template>
+      <template #video_ids>
+        <div
+          v-show="formData.video_ids && formData.video_ids.length > 0"
+          style="width: 100%; padding: 0 0 15px 0"
+        >
+          <el-tag
+            v-for="(tag, index) in formData.video_ids"
+            :key="tag.id + index"
+            class="mx-1"
+            disable-transitions
+            closable
+            size="large"
+            @close="formData.video_ids.splice(index, 1)"
+          >
+            {{ tag.video_name }}
+          </el-tag>
+        </div>
+        <div style="width: 50%">
+          <Video
+            v-model="Video_id"
+            placeholder="请选择直播视频"
+            @change="videoChange"
+          />
+        </div>
+      </template>
+      <template #footer>
+        <div class="w-full flex justify-end">
+          <ElButton type="primary" @click="handleCreate">保存</ElButton>
+        </div>
+      </template>
+    </BasicForm>
+  </PageModal>
   <!-- </PageAuth> -->
 </template>

src/views/operate/setComCard/config/_details.ts

@@ -18,84 +18,7 @@ export const projectFormConfig: FormConfig = {
 
       slot: "card_id"
     },
-    {
-      label: "服务名称",
-      field: "title",
-      type: "input",
-      placeholder: "服务名称",
-      span: 24
-    },
-    {
-      label: "原价",
-      field: "original_price",
-      type: "number",
-      placeholder: "原价",
-      otherOptions: {
-        precision: 2,
-        step: 1,
-        "controls-position": "right",
-        min: 0,
-        max: 99999999
-      },
-      span: 12
-    },
-    {
-      label: "活动价",
-      field: "activity_price",
-      type: "number",
-      placeholder: "活动价",
-      otherOptions: {
-        precision: 2,
-        step: 1,
-        "controls-position": "right",
-        min: 0,
-        max: 99999999
-      },
-      span: 12
-    },
-
-    {
-      label: "活动开始日期",
-      field: "starttime",
-      type: "date_picker",
-      otherOptions: {
-        type: "date",
-        format: "YYYY-MM-DD"
-      },
-      placeholder: "活动开始日期",
-      span: 12
-    },
-    {
-      label: "活动结束日期",
-      field: "endtime",
-      type: "date_picker",
 
-      otherOptions: {
-        type: "date",
-        format: "YYYY-MM-DD"
-      },
-      placeholder: "活动结束日期",
-      span: 12
-    },
-    {
-      label: "服务到期日期",
-      field: "expiretime",
-      type: "date_picker",
-
-      otherOptions: {
-        type: "date",
-        format: "YYYY-MM-DD"
-      },
-      placeholder: "服务到期日期",
-      span: 24
-    },
-    {
-      label: "服务介绍",
-      field: "content",
-      type: "textarea",
-      placeholder: "服务介绍",
-      span: 24
-    },
     {
       label: "备注",
       field: "remark",

src/views/operate/setComCard/config/content.config.ts

@@ -21,7 +21,12 @@ const columns = [
     label: "ID"
   },
   {
-    prop: "title",
+    prop: "company_title",
+    label: "公司名称"
+  },
+
+  {
+    prop: "card_title",
     label: "卡类型"
   },
 
@@ -30,14 +35,7 @@ const columns = [
     label: "状态",
     ...renderStatus(STATUS_OPTIONS)
   },
-  {
-    prop: "contacts",
-    label: "联系人"
-  },
-  {
-    prop: "mobile",
-    label: "联系方式"
-  },
+
   {
     prop: "addtime",
     label: "创建时间",

src/views/operate/setComCard/config/search.config.ts

@@ -3,11 +3,9 @@ import { isLicense } from "/@/utils/validate";
 
 const modalConfig: ModalConfig = {
   title: "服务",
-  colLayout: { span: 24 },
   itemStyle: {},
   contact: "setService",
   labelWidth: "100px",
-  width: "700px",
   formItems: [
     {
       field: "company_title",

src/views/operate/setComGood/config/_details.ts

@@ -3,105 +3,19 @@ import { FormConfig } from "/@/components/PageSearch";
 export const projectFormConfig: FormConfig = {
   formItems: [
     {
-      label: "公司",
-      field: "company_id",
-      placeholder: "公司",
+      label: "公司卡类型",
+      field: "group_id",
+      placeholder: "公司卡类型",
       span: 24,
-
-      slot: "company_id"
+      slot: "group_id"
     },
     {
-      label: "卡类型",
-      field: "card_id",
-      placeholder: "卡类型",
+      label: "商品信息",
+      field: "good_id",
+      type: "array",
+      placeholder: "商品信息",
       span: 24,
-
-      slot: "card_id"
-    },
-    {
-      label: "服务名称",
-      field: "title",
-      type: "input",
-      placeholder: "服务名称",
-      span: 24
-    },
-    {
-      label: "原价",
-      field: "original_price",
-      type: "number",
-      placeholder: "原价",
-      otherOptions: {
-        precision: 2,
-        step: 1,
-        "controls-position": "right",
-        min: 0,
-        max: 99999999
-      },
-      span: 12
-    },
-    {
-      label: "活动价",
-      field: "activity_price",
-      type: "number",
-      placeholder: "活动价",
-      otherOptions: {
-        precision: 2,
-        step: 1,
-        "controls-position": "right",
-        min: 0,
-        max: 99999999
-      },
-      span: 12
-    },
-
-    {
-      label: "活动开始日期",
-      field: "starttime",
-      type: "date_picker",
-      otherOptions: {
-        type: "date",
-        format: "YYYY-MM-DD"
-      },
-      placeholder: "活动开始日期",
-      span: 12
-    },
-    {
-      label: "活动结束日期",
-      field: "endtime",
-      type: "date_picker",
-
-      otherOptions: {
-        type: "date",
-        format: "YYYY-MM-DD"
-      },
-      placeholder: "活动结束日期",
-      span: 12
-    },
-    {
-      label: "服务到期日期",
-      field: "expiretime",
-      type: "date_picker",
-
-      otherOptions: {
-        type: "date",
-        format: "YYYY-MM-DD"
-      },
-      placeholder: "服务到期日期",
-      span: 24
-    },
-    {
-      label: "服务介绍",
-      field: "content",
-      type: "textarea",
-      placeholder: "服务介绍",
-      span: 24
-    },
-    {
-      label: "备注",
-      field: "remark",
-      type: "textarea",
-      placeholder: "备注",
-      span: 24
+      slot: "good_id"
     }
   ]
 };

src/views/operate/setComGood/config/_rules.ts

@@ -1,14 +1,14 @@
 import { FormRules } from "element-plus";
 import { isArray, validUpperCase } from "/@/utils/validate";
 export const projectFormRules: FormRules = {
-  company_id: {
+  group_id: {
     trigger: "change",
     required: true,
-    message: "请选择公司"
+    message: "请选择公司卡类型"
   },
-  card_id: {
+  good_id: {
     trigger: "change",
     required: true,
-    message: "请选择卡类型"
+    message: "请选择商品"
   }
 };

src/views/operate/setComGood/config/content.config.ts

@@ -6,8 +6,8 @@ import {
   httpStatus,
   httpDelete
 } from "/@/api/operate/setComGood";
-import { renderStatus } from "/@/utils/column-helper";
-import { STATUS_OPTIONS } from "/@/config/status";
+import { GOOD_OPTIONS, STATUS_OPTIONS } from "/@/config/status";
+import { renderImage, renderStatus } from "/@/utils/column-helper";
 
 const columns = [
   {
@@ -21,27 +21,74 @@ const columns = [
     label: "ID"
   },
   {
-    prop: "title",
-    label: "卡类型"
+    label: "商品编号",
+    prop: "good_code",
+    width: 180,
+    showOverflowTooltip: true
   },
-
   {
     prop: "status",
     label: "状态",
     ...renderStatus(STATUS_OPTIONS)
   },
   {
-    prop: "contacts",
-    label: "联系人"
+    prop: "company_title",
+    label: "公司名称"
+  },
+  {
+    prop: "card_title",
+    label: "卡类型"
+  },
+
+  {
+    label: "商品类型",
+    prop: "type",
+    width: 95,
+    showOverflowTooltip: true,
+    ...renderStatus(GOOD_OPTIONS, "type")
+  },
+  {
+    label: "图片",
+    prop: "good_cover_img",
+    width: 60,
+    showOverflowTooltip: true,
+    ...renderImage("good_cover_img")
   },
   {
-    prop: "mobile",
-    label: "联系方式"
+    label: "商品名称",
+    prop: "good_name",
+    minWidth: 160
   },
+  {
+    label: "单位",
+    prop: "unit",
+    width: 80,
+    showOverflowTooltip: true
+  },
+  {
+    label: "起订量",
+    prop: "moq",
+    width: 80,
+    showOverflowTooltip: true
+  },
+  {
+    label: "步长",
+    prop: "step",
+    width: 80,
+    showOverflowTooltip: true
+  },
+  {
+    label: "售价",
+    prop: "price",
+    width: 110,
+    showOverflowTooltip: true
+  },
+
   {
     prop: "addtime",
     label: "创建时间",
-    sortable: true
+    width: 155
+    // sortable: true
   },
 
   {
@@ -58,7 +105,6 @@ const contentConfig: ContentConfig = {
   apis: {
     httpAdd,
     httpList,
-    httpUpdate,
     httpStatus,
     httpDelete
   }

src/views/operate/setComGood/config/search.config.ts

@@ -1,14 +1,20 @@
 import { ModalConfig } from "/@/components/PageModal/src/types";
 import { isLicense } from "/@/utils/validate";
-
+import { STATUS_OPTIONS } from "/@/config/status";
+import { convertOptions } from "/@/utils/column-helper";
 const modalConfig: ModalConfig = {
   title: "服务",
-  colLayout: { span: 24 },
   itemStyle: {},
   contact: "setService",
-  labelWidth: "100px",
-  width: "700px",
+  labelWidth: "90px",
   formItems: [
+    {
+      field: "status",
+      type: "select",
+      label: "状态",
+      placeholder: "状态",
+      options: convertOptions(STATUS_OPTIONS)
+    },
     {
       field: "company_title",
       type: "input",
@@ -21,6 +27,13 @@ const modalConfig: ModalConfig = {
       type: "input",
       label: "卡类型",
       placeholder: "卡类型"
+    },
+
+    {
+      field: "good_code",
+      type: "input",
+      label: "商品编码",
+      placeholder: "商品编码"
     }
   ]
 };

src/views/operate/setComGood/cpns/ladder-modal.vue

@@ -64,54 +64,19 @@ defineExpose({
     v-model="visible"
     @close="() => (formData = { ...defaultData })"
   >
-    <ElForm
-      ref="formRef"
-      :model="formData"
-      :rules="ladderFormRules"
-      label-width="100px"
-      size="small"
-    >
-      <ElFormItem label="预算单价" prop="budget_price">
-        <AmountInput v-model="formData.budget_price" />
-      </ElFormItem>
-
-      <ElFormItem label="购买数量" prop="num">
-        <NumberInput placeholder="购买数量" v-model="formData.num" />
-      </ElFormItem>
-
-      <ElFormItem label="商品类型" prop="good_type">
-        <ElSelect
-          style="width: 100%"
-          placeholder="商品类型"
-          v-model="formData.good_type"
-        >
-          <ElOption
-            v-for="item in goodTypeOptions"
-            :value="item.id"
-            :label="item.label"
-            :key="item.id"
-          />
-        </ElSelect>
-      </ElFormItem>
-
-      <ElFormItem label="商品分类" prop="cat_info">
-        <GoodClass v-model="formData.cat_info" style="width: 100%" />
-      </ElFormItem>
-
-      <ElFormItem label="商品名称" prop="good_name">
-        <ElInput placeholder="商品名称" v-model="formData.good_name" />
-      </ElFormItem>
-
-      <ElFormItem label="商品图片" prop="good_info_img">
-        <ImageUpload />
-      </ElFormItem>
-
-      <ElFormItem>
+    <PageContent
+    ref="pageContentRef"
+    :content-config="contentConfig"
+    @create-btn-click="handleCreateData"
+  />
+
+    
+     
         <div class="w-full flex justify-end">
           <ElButton type="primary" @click="handleConfirm">保存</ElButton>
           <ElButton @click="() => (visible = false)">取消</ElButton>
         </div>
-      </ElFormItem>
-    </ElForm>
+    
+    
   </ElDialog>
 </template>

src/views/operate/setComGood/cpns/ladder-table.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import { goodTypeOptions } from "../config/_options";
+// import { goodTypeOptions } from "../config/_options";
 import { useRenderIcon } from "/@/components/ReIcon/src/hooks";
-
+import { GOOD_OPTIONS } from "/@/config/status";
 const emit = defineEmits(["choose", "delete", "update"]);
 
 defineProps<{
@@ -11,49 +11,47 @@ defineProps<{
 </script>
 
 <template>
-  <ElTable size="small" border :data="ladder">
-    <ElTableColumn prop="name" label="商品阶梯">
+  <ElTable size="small" border :data="ladder" max-height="500px">
+    <ElTableColumn prop="name" label="顺序" width="110px">
       <template #="{ $index }">
         {{ $index + 1 }}
       </template>
     </ElTableColumn>
 
-    <ElTableColumn prop="good_type" label="商品类型">
+    <ElTableColumn prop="type" label="商品类型" width="110px">
       <template #="{ row }">
         <ElTag>{{
-          goodTypeOptions.find(({ id }) => id === row.good_type)?.label || "--"
+          GOOD_OPTIONS.find(({ id }) => id === row.type + "")?.label || "--"
         }}</ElTag>
       </template>
     </ElTableColumn>
-    <ElTableColumn prop="budget_price" label="预算单价" />
-
-    <ElTableColumn prop="num" label="购买数量" />
-
-    <ElTableColumn prop="cat_name" label="商品分类" width="280">
-      <template #="{ row }">
-        {{ row.cat_info.map(({ name }) => name).join("_") }}
-      </template>
-    </ElTableColumn>
-
-    <ElTableColumn prop="good_img" label="图片">
+    <ElTableColumn prop="good_cover_img" width="60" label="图片">
       <template #="{ row }">
         <ElImage
-          v-if="row.good_img"
-          style="width: 20px; height: 20px"
-          :preview-src-list="[row.good_img]"
-          preview-teleported=""
+          :src="row.good_cover_img"
+          fit="cover"
+          lazy
+          :preview-src-list="
+            row.good_cover_img !== '' ? [row.good_cover_img] : []
+          "
+          z-index="99999"
+          preview-teleported
         />
       </template>
     </ElTableColumn>
-
     <ElTableColumn prop="good_name" label="商品名称" />
 
-    <ElTableColumn v-if="!readonly">
+    <ElTableColumn prop="unit" label="单位" width="80px" />
+    <ElTableColumn prop="moq" label="起订量" width="80px" />
+    <ElTableColumn prop="step" label="步长" width="80px" />
+    <ElTableColumn prop="price" label="售价" width="110px" />
+
+    <ElTableColumn v-if="!readonly" width="80px">
       <template #header>
         <div class="w-full flex justify-between">
           <p>操作</p>
 
-          <ElTooltip content="添加阶梯" placement="top">
+          <ElTooltip content="添加" placement="top">
             <ElButton
               link
               :icon="useRenderIcon('add')"
@@ -64,14 +62,6 @@ defineProps<{
       </template>
 
       <template #="{ $index, row }">
-        <ElButton
-          text
-          type="primary"
-          size="small"
-          @click="() => emit('update', { data: row, index: $index })"
-          >编辑</ElButton
-        >
-
         <ElButton
           text
           type="primary"

src/views/operate/setComGood/detail.vue

@@ -1,105 +0,0 @@
-<script setup lang="ts">
-import CommodityFeedback from "./cpns/commodity-feedback.vue";
-import ApprovalRecord from "/@/components/ApprovalRecord";
-import PgaeDetail from "/@/components/PageDetail";
-// import SchemePlans from "./cpns/scheme-plan.vue";
-import ProjectForm from "./cpns/project-form.vue";
-import { useAsync } from "/@/hooks/useAsync";
-import { useDetail } from "/@/hooks/useDetail";
-import { useRouter } from "vue-router";
-
-import {
-  httpDetail,
-  httpCreate
-  // httpCommodityFeedback
-} from "/@/api/operate/setComGood";
-
-//方案制作状态
-const schemeStatus = ["3", "4", "5", "6"];
-
-const { push } = useRouter();
-
-const { isDetail, collapses, label, id } = useDetail({
-  baseName: "项目",
-  collapseLen: 2
-});
-
-const {
-  data: projectData,
-  run: project,
-  loading: projectLoading
-} = useAsync<Record<string, string>>({
-  initalData: {}
-});
-
-const {
-  data: feedbackData,
-  run: feedback,
-  loading: feedbackLoading
-} = useAsync({
-  initalData: {},
-  isList: true
-});
-
-const { run: create } = useAsync({
-  success: () => push("/operate/setComGood")
-});
-
-const handleCreate = data => create(httpCreate(data));
-
-function initalData() {
-  if (!id.value) {
-    return;
-  }
-
-  project(httpDetail({ projectNo: id.value }));
-  // feedback(httpCommodityFeedback({ projectNo: id.value }));
-}
-
-initalData();
-</script>
-
-<template>
-  <PgaeDetail>
-    <ElTabs>
-      <ElTabPane :label="label">
-        <ElCollapse v-model="collapses">
-          <ElCollapseItem :title="label" name="1" v-loading="projectLoading">
-            <ProjectForm
-              :readonly="isDetail"
-              :data="projectData"
-              @create="handleCreate"
-            />
-          </ElCollapseItem>
-        </ElCollapse>
-
-        <template v-if="isDetail" />
-      </ElTabPane>
-
-      <template v-if="isDetail">
-        <!-- <ElTabPane label="商品反馈详情" v-loading="feedbackLoading">
-          <CommodityFeedback :feedback="feedbackData" />
-        </ElTabPane>
-
-        <ElTabPane
-          v-if="schemeStatus.includes(projectData.status)"
-          label="方案制作"
-        >
-          <SchemePlans
-            :id="id"
-            :feedback="feedbackData"
-            :project="projectData"
-          />
-        </ElTabPane> -->
-
-        <ElTabPane label="审批记录">
-          <!-- <ApprovalRecord :orderCode="id" :type="'PRO'" /> -->
-        </ElTabPane>
-
-        <ElTabPane label="流程图">
-          <!-- <FlowChart processId="14" :orderCode="id" type="PRO" /> -->
-        </ElTabPane>
-      </template>
-    </ElTabs>
-  </PgaeDetail>
-</template>

src/views/operate/setComGood/index.vue

@@ -2,12 +2,12 @@
 import { PageSearch, usePageSearch } from "/@/components/PageSearch";
 import searchConfig from "./config/search.config";
 import contentConfig from "./config/content.config";
-import PageAuth from "/@/components/PageAuth";
+// import PageAuth from "/@/components/PageAuth";
 import { PageModal, usePageModal } from "/@/components/PageModalShell";
 import modalConfig from "./config/modal.config";
 import { PageContent } from "/@/components/PageContent";
 import type { PageContentInstance } from "/@/components/PageContent";
-import { Company, Card } from "/@/components/RemoteSelect";
+import { ComCard } from "/@/components/RemoteSelect";
 import { projectFormConfig } from "./config/_details";
 import { projectFormRules } from "./config/_rules";
 import {
@@ -15,12 +15,14 @@ import {
   transform,
   createDefaultData
 } from "/@/components/BasicForm";
+import LadderTable from "./cpns/ladder-table.vue";
 import { ElImage } from "element-plus";
 import { httpDetail } from "/@/api/operate/setService";
 import { ElForm } from "element-plus";
 import { ref, unref } from "vue";
 import dayjs from "dayjs";
 import { useResponseHandle } from "/@/hooks/useAsync";
+import OrderDialog from "/@/components/PageListModal";
 const responseHandle = useResponseHandle();
 // import { httpDetail } from "/@/api/parameter/video";
 const pageContentRef = ref<PageContentInstance | null>(null);
@@ -36,25 +38,25 @@ const {
 });
 const { handleResetClick, handleSearchClick } = usePageSearch();
 const { formItems } = projectFormConfig;
-
+const modelRef = ref<InstanceType<typeof OrderDialog>>(null);
 const basicFormRef = ref<InstanceType<typeof ElForm>>(null);
 const formData = ref<Record<string, any>>(createDefaultData(formItems));
 function handleCreate() {
   basicFormRef.value.validate(isValid => {
-    if (!isValid) return;
-    const params = unref(formData);
-    const { starttime, endtime, expiretime } = params;
-    params.starttime = starttime ? dayjs(starttime).format("YYYY-MM-DD") : "";
-    params.endtime = endtime ? dayjs(endtime).format("YYYY-MM-DD") : "";
-    params.expiretime = expiretime
-      ? dayjs(expiretime).format("YYYY-MM-DD")
-      : "";
-    if (
-      new Date(params.starttime).valueOf() >= new Date(params.endtime).valueOf()
-    ) {
-      ElImage.warning("活动开始日期不能大于活动结束日期！");
-      return;
-    }
+    console.log(isValid);
+    // if (!isValid) return;
+
+    const { group_id, good_id } = formData.value;
+    if (!group_id || good_id.length == 0) return;
+    console.log(formData.value);
+    const params = {
+      group_id,
+      good_id: []
+    };
+    good_id.forEach(si => {
+      console.log(si);
+      params.good_id.push(si.id);
+    });
     handleConfrim("create", params);
   });
 }
@@ -75,6 +77,16 @@ async function handleDetailData(row, type) {
     }
   });
 }
+
+function handleAddOrder(list) {
+  list.forEach(item => {
+    const { id } = item;
+    let findex = formData.value.good_id.findIndex(e => e.id + "" == id + "");
+    if (findex == -1) {
+      formData.value.good_id.push(item);
+    }
+  });
+}
 </script>
 
 <template>
@@ -105,11 +117,16 @@ async function handleDetailData(row, type) {
       :disabled="false"
       label-width="120px"
     >
-      <template #company_id>
-        <Company v-model="formData.company_id" placeholder="公司" />
+      <template #group_id>
+        <ComCard v-model="formData.group_id" placeholder="公司卡类型" />
       </template>
-      <template #card_id>
-        <Card v-model="formData.card_id" placeholder="卡类型" />
+      <template #good_id>
+        <LadderTable
+          :readonly="false"
+          :ladder="formData.good_id"
+          @choose="() => modelRef.show('')"
+          @delete="index => formData.good_id.splice(index, 1)"
+        />
       </template>
       <template #footer>
         <div class="w-full flex justify-end">
@@ -118,5 +135,6 @@ async function handleDetailData(row, type) {
       </template>
     </BasicForm>
   </PageModal>
+  <OrderDialog ref="modelRef" @save-btn-click="handleAddOrder" />
   <!-- </PageAuth> -->
 </template>

src/views/operate/setTheme/config/_details.ts

@@ -0,0 +1,53 @@
+/* eslint-disable prettier/prettier */
+import { FormConfig } from "/@/components/PageSearch";
+export const projectFormConfig: FormConfig = {
+  labelWidth: "85px",
+  formItems: [
+    {
+      label: "公司卡类型",
+      field: "group_id",
+      slot: "group_id",
+      placeholder: "公司卡类型",
+      span: 24
+    },
+    {
+      label: "主题编码",
+      field: "code",
+      type: "input",
+      placeholder: "主题编码",
+      span: 24
+    },
+    {
+      label: "首页轮播",
+      field: "modular1",
+      placeholder: "首页轮播",
+      span: 24,
+      type: "array",
+      slot: "modular1"
+    },
+    {
+      label: "产品宣传",
+      field: "modular2",
+      placeholder: "产品宣传",
+      span: 24,
+      type: "array",
+      slot: "modula2"
+    },
+    {
+      label: "产品展示",
+      field: "modular3",
+      placeholder: "产品展示",
+      span: 24,
+      type: "array",
+      slot: "modula3"
+    },
+    {
+      label: "产品优势",
+      field: "modular4",
+      placeholder: "产品优势",
+      span: 24,
+      type: "array",
+      slot: "modula4"
+    }
+  ]
+};

src/views/operate/setTheme/config/_rules.ts

@@ -0,0 +1,119 @@
+import { ref, reactive } from "vue";
+import type { FormInstance, FormRules } from "element-plus";
+import { isArray, validUpperCase } from "/@/utils/validate";
+const ruleFormRef = ref<FormInstance>();
+export const projectFormRules = reactive<FormRules>({
+  group_id: [
+    { required: true, message: "请选择公司卡类型", trigger: "change" }
+  ],
+  code: [
+    {
+      required: true,
+      message: "请输入主题编码",
+      trigger: "blur"
+    }
+  ],
+  modular1_status: [
+    {
+      required: true,
+      message: "请选择首页轮播是否启用",
+      trigger: "change"
+    }
+  ],
+  modular1_data: [
+    {
+      type: "array",
+      required: true,
+      message: "数据不能为空",
+      trigger: "change"
+    }
+  ],
+  modular2_status: [
+    {
+      required: true,
+      message: "请选择产品宣传是否启用",
+      trigger: "change"
+    }
+  ],
+  // modular2_title: [
+  //   {
+  //     required: true,
+  //     message: "请输入产品宣传名称",
+  //     trigger: "blur"
+  //   }
+  // ],
+  modular2_data: [
+    {
+      type: "array",
+      required: true,
+      message: "数据不能为空",
+      trigger: "change"
+    }
+  ],
+  modular3_status: [
+    {
+      required: true,
+      message: "请选择产品展示是否启用",
+      trigger: "change"
+    }
+  ],
+  modular3_title: [
+    {
+      required: true,
+      message: "请输入区域名称",
+      trigger: "blur"
+    }
+  ],
+  modular3_data: [
+    {
+      type: "array",
+      required: true,
+      message: "数据不能为空",
+      trigger: "change"
+    }
+  ],
+  modular4_status: [
+    {
+      required: true,
+      message: "请选择产品优势是否启用",
+      trigger: "change"
+    }
+  ],
+  modular4_title: [
+    {
+      required: true,
+      message: "请输入区域名称",
+      trigger: "blur"
+    }
+  ],
+  modular4_data: [
+    {
+      type: "array",
+      required: true,
+      message: "数据不能为空",
+      trigger: "change"
+    }
+  ]
+});
+export const ladderFormRules: FormRules = {
+  img: {
+    trigger: "change",
+    required: true,
+    message: "请上传图片"
+  },
+  jump_type: {
+    trigger: "change",
+    required: true,
+    message: "请选择跳转类型"
+  },
+  jump_param: {
+    trigger: "change",
+    required: true,
+    message: "请输入跳转地址"
+  },
+  style_type: {
+    trigger: "change",
+    required: true,
+    message: "请选择样式类型"
+  }
+};

src/views/operate/setTheme/config/content.config.ts

@@ -3,8 +3,7 @@ import {
   httpList,
   httpAdd,
   httpUpdate,
-  httpStatus,
-  httpDelete
+  httpStatus
 } from "/@/api/operate/setTheme";
 import { renderStatus } from "/@/utils/column-helper";
 import { STATUS_OPTIONS } from "/@/config/status";
@@ -21,27 +20,29 @@ const columns = [
     label: "ID"
   },
   {
-    prop: "title",
+    prop: "company_title",
+    label: "公司名称"
+  },
+  {
+    prop: "card_title",
     label: "卡类型"
   },
+  {
+    prop: "code",
+    label: "主题编号"
+  },
 
   {
     prop: "status",
     label: "状态",
     ...renderStatus(STATUS_OPTIONS)
   },
-  {
-    prop: "contacts",
-    label: "联系人"
-  },
-  {
-    prop: "mobile",
-    label: "联系方式"
-  },
+
   {
     prop: "addtime",
     label: "创建时间",
-    sortable: true
+    sortable: true,
+    width: 160
   },
 
   {
@@ -53,14 +54,13 @@ const columns = [
 ];
 
 const contentConfig: ContentConfig = {
-  title: "商品管理",
+  title: "主题设置",
   columns,
   apis: {
     httpAdd,
     httpList,
     httpUpdate,
-    httpStatus,
-    httpDelete
+    httpStatus
   }
 };
 

src/views/operate/setTheme/config/search.config.ts

@@ -11,19 +11,14 @@ const searchFormConfig: FormConfig = {
       options: convertOptions(STATUS_OPTIONS)
     },
     {
-      field: "title",
+      field: "company_title",
       type: "input",
       placeholder: "企业名称"
     },
     {
-      field: "contacts",
+      field: "card_title",
       type: "input",
-      placeholder: "联系人"
-    },
-    {
-      field: "mobile",
-      type: "input",
-      placeholder: "联系方式"
+      placeholder: "卡类型"
     }
   ]
 };

src/views/operate/setTheme/cpns/addModel.vue

@@ -0,0 +1,385 @@
+<script setup lang="ts">
+import { computed, ref, watchEffect, reactive, unref } from "vue";
+import { ActionType } from "/@/components/PageContent";
+import { createBasicTitle } from "./utils/create-basic-title";
+import { ElForm, ElMessage } from "element-plus";
+import type { FormInstance, FormRules } from "element-plus";
+import { projectFormRules } from "../config/_rules";
+import { ComCard } from "/@/components/RemoteSelect";
+import { STATUS_OPTIONS } from "/@/config/status";
+import LadderTable from "./ladder-table.vue";
+import LadderModal from "./ladder-modal.vue";
+import { useNav } from "/@/layout/hooks/useNav";
+import OrderDialog from "/@/components/PageListModal";
+const { logout } = useNav();
+import { httpAdd, httpDetail, httpUpdate } from "/@/api/operate/setTheme";
+const ladderModalRef = ref<InstanceType<typeof LadderModal>>(null);
+const modelRef = ref<InstanceType<typeof OrderDialog>>(null);
+const emit = defineEmits(["submitOk"]);
+const ruleFormRef = ref<FormInstance>();
+const form = {
+  id: "",
+  group_id: "",
+  code: "",
+  modular1_type: "1",
+  modular1_status: "1",
+  modular1_title: "轮播区",
+  modular1_data: [],
+  modular2_type: "2",
+  modular2_status: "1",
+  modular2_title: "产品宣传",
+  modular2_data: [],
+  modular3_type: "3",
+  modular3_status: "1",
+  modular3_title: "产品展示",
+  modular3_data: [],
+  modular4_type: "4",
+  modular4_status: "1",
+  modular4_title: "产品优势",
+  modular4_data: []
+};
+const ruleForm = reactive({ ...form });
+const basicFormRef = ref<InstanceType<typeof ElForm>>(null);
+
+const type = ref<ActionType>("preview");
+const dialogVisible = ref(false);
+const confirmLoading = ref(false);
+const title = ref("");
+const uID = ref("");
+
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) return;
+  await formEl.validate(async (valid, fields) => {
+    if (valid) {
+      if (confirmLoading.value) return;
+
+      confirmLoading.value = true;
+      const { id, group_id, code } = ruleForm;
+      const model = {
+        id,
+        group_id,
+        code,
+        modular: []
+      };
+      for (let i = 1; i < 5; i++) {
+        let modela = {
+          type: ruleForm[`modular${i}_type`],
+          status: ruleForm[`modular${i}_status`],
+          title: i < 3 ? "" : ruleForm[`modular${i}_title`],
+          data: ruleForm[`modular${i}_data`]
+        };
+        // const data = JSON.parse(JSON.stringify(modela.data))
+        // da
+        model.modular.push(modela);
+      }
+      let res = {};
+      if (type.value == "create") {
+        delete model["id"];
+        res = await httpAdd(model);
+      } else {
+        res = await httpUpdate(model);
+      }
+      const { code: hcode, data, message } = res;
+      confirmLoading.value = false;
+      if (hcode === 0) {
+        dialogVisible.value = false;
+        emit("submitOk", {});
+      } else if (hcode >= 100 && hcode <= 104) {
+        logout();
+      } else {
+        ElMessage.warning(message);
+      }
+    } else {
+      console.log("error submit!", fields);
+    }
+  });
+};
+
+async function handlePush(_ladder, index, type) {
+  console.log(ruleForm);
+  ruleForm[`modular${type}_data`].push(_ladder);
+}
+
+function modularShow() {
+  if (!ruleForm.group_id) return ElMessage.warning("请选择公司卡类型！");
+  modelRef.value.show("");
+}
+async function handleUpdate(_ladder, index, type) {
+  ruleForm[`modular${type}_data`][index] = _ladder;
+}
+function handleAddOrder(list) {
+  console.log(list);
+  list.forEach(item => {
+    const { id } = item;
+    let findex = ruleForm.modular3_data.findIndex(e => e.id + "" == id + "");
+    if (findex == -1) {
+      let model = Object.assign(item, {
+        img: item.good_cover_img,
+        good_id: item.id,
+        jump_type: "2",
+        jump_param: `/good?id=${item.id}`,
+        style_type: "",
+        title: ""
+      });
+      ruleForm.modular3_data.push(model);
+    }
+  });
+}
+const initData = async () => {
+  if (confirmLoading.value) return;
+  confirmLoading.value = true;
+  const { code, data, message } = await httpDetail({ id: uID.value });
+  if (code === 0) {
+    const { id, code, group_id, modular } = data;
+    ruleForm.id = id;
+    ruleForm.code = code;
+    ruleForm.group_id = group_id;
+    modular.forEach(item => {
+      const { type } = item;
+      ruleForm[`modular${type}_type`] = type + "";
+      ruleForm[`modular${type}_status`] = item?.status + "" || "";
+      ruleForm[`modular${type}_title`] = item?.title + "" || "";
+      ruleForm[`modular${type}_data`] = item?.data || [];
+    });
+  } else if (code >= 100 && code <= 104) {
+    logout();
+  } else {
+    ElMessage.warning(message);
+  }
+  confirmLoading.value = false;
+};
+defineExpose({
+  onShow: async (basicTitle: string, readonly: ActionType, id: string) => {
+    type.value = readonly;
+    const readTitle = createBasicTitle(type.value);
+    title.value =
+      readonly == "preview" ? basicTitle + readTitle : readTitle + basicTitle;
+    Object.keys(ruleForm).forEach(key => {
+      ruleForm[key] = form[key];
+    });
+    dialogVisible.value = true;
+    confirmLoading.value = false;
+    uID.value = id;
+    if (type.value !== "create") {
+      await initData();
+    }
+  }
+});
+</script>
+
+<template>
+  <el-dialog
+    :title="title"
+    v-model="dialogVisible"
+    center
+    top="5vh"
+    destroy-on-close
+    width="1024px"
+  >
+    <el-form
+      ref="ruleFormRef"
+      v-loading="confirmLoading"
+      :model="ruleForm"
+      :rules="projectFormRules"
+      label-width="100px"
+      :disabled="type === 'preview'"
+      status-icon
+    >
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="主题编号" prop="code">
+            <el-input v-model="ruleForm.code" placeholder="主题编号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="16">
+          <el-form-item label="公司卡类型" prop="group_id">
+            <ComCard v-model="ruleForm.group_id" placeholder="公司卡类型" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="轮播区域" prop="modular1_status">
+                <el-select
+                  v-model="ruleForm.modular1_status"
+                  placeholder="是否使用"
+                  style="width: 100%"
+                >
+                  <el-option
+                    v-for="(item, index) in STATUS_OPTIONS"
+                    :label="item.label"
+                    :value="item.id"
+                    :key="item.id + index"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <el-form-item
+                label="数据"
+                label-width="60px"
+                prop="modular1_data"
+              >
+                <LadderTable
+                  :readonly="type === 'preview'"
+                  :type="1"
+                  :ladder="ruleForm.modular1_data"
+                  @delete="index => ruleForm.modular1_data.splice(index, 1)"
+                  @choose="() => ladderModalRef.onDisplay(0, '1')"
+                  @update="
+                    ({ data, index }) =>
+                      ladderModalRef.onDisplay(index, '1', data)
+                  "
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-col>
+
+        <el-col :span="24">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="产品宣传" prop="modular2_status">
+                <el-select
+                  v-model="ruleForm.modular2_status"
+                  style="width: 100%"
+                  placeholder="是否使用"
+                >
+                  <el-option
+                    v-for="(item, index) in STATUS_OPTIONS"
+                    :label="item.label"
+                    :value="item.id"
+                    :key="item.id + index"
+                  />
+                </el-select>
+              </el-form-item>
+              <!-- <el-form-item label="区域名称" prop="modular2_title">
+                <el-input v-model="ruleForm.modular2_title" />
+              </el-form-item> -->
+            </el-col>
+            <el-col :span="16">
+              <el-form-item
+                label="数据"
+                label-width="60px"
+                prop="modular2_data"
+              >
+                <LadderTable
+                  :readonly="type === 'preview'"
+                  :type="2"
+                  :ladder="ruleForm.modular2_data"
+                  @delete="index => ruleForm.modular2_data.splice(index, 1)"
+                  @choose="() => ladderModalRef.onDisplay(0, '2')"
+                  @update="
+                    ({ data, index }) =>
+                      ladderModalRef.onDisplay(index, '2', data)
+                  "
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="24">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="产品展示" prop="modular3_status">
+                <el-select
+                  v-model="ruleForm.modular3_status"
+                  style="width: 100%"
+                  placeholder="是否使用"
+                >
+                  <el-option
+                    v-for="(item, index) in STATUS_OPTIONS"
+                    :label="item.label"
+                    :value="item.id"
+                    :key="item.id + index"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="区域名称" prop="modular3_title">
+                <el-input
+                  v-model="ruleForm.modular3_title"
+                  placeholder="区域名称"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <el-form-item
+                label="数据"
+                label-width="60px"
+                prop="modular3_data"
+              >
+                <LadderTable
+                  :readonly="type === 'preview'"
+                  :type="3"
+                  :ladder="ruleForm.modular3_data"
+                  @delete="index => ruleForm.modular3_data.splice(index, 1)"
+                  @choose="() => modularShow()"
+                  @update="
+                    ({ data, index }) =>
+                      ladderModalRef.onDisplay(index, '3', data)
+                  "
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="24">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="产品优势" prop="modular4_status">
+                <el-select
+                  v-model="ruleForm.modular4_status"
+                  style="width: 100%"
+                  placeholder="是否使用"
+                >
+                  <el-option
+                    v-for="(item, index) in STATUS_OPTIONS"
+                    :label="item.label"
+                    :value="item.id"
+                    :key="item.id + index"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="区域名称" prop="modular4_title">
+                <el-input
+                  v-model="ruleForm.modular4_title"
+                  placeholder="区域名称"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <el-form-item
+                label="数据"
+                label-width="60px"
+                prop="modular4_data"
+              >
+                <LadderTable
+                  :readonly="type === 'preview'"
+                  :type="4"
+                  :ladder="ruleForm.modular4_data"
+                  @delete="index => ruleForm.modular4_data.splice(index, 1)"
+                  @choose="() => ladderModalRef.onDisplay(0, '4')"
+                  @update="
+                    ({ data, index }) =>
+                      ladderModalRef.onDisplay(index, '4', data)
+                  "
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-col>
+      </el-row>
+
+      <el-form-item v-if="type !== 'preview'">
+        <div class="w-full flex justify-end">
+          <el-button type="primary" @click="submitForm(ruleFormRef)"
+            >提交</el-button
+          >
+          <ElButton @click="() => (dialogVisible = false)">取消</ElButton>
+        </div>
+      </el-form-item>
+    </el-form>
+  </el-dialog>
+  <LadderModal ref="ladderModalRef" @update="handleUpdate" @push="handlePush" />
+  <OrderDialog ref="modelRef" @save-btn-click="handleAddOrder" />
+</template>

src/views/operate/setTheme/cpns/ladder-modal.vue

@@ -0,0 +1,169 @@
+<script setup lang="ts">
+import { ref, unref, computed, reactive } from "vue";
+import { ElForm } from "element-plus";
+
+import { ImageUpload } from "/@/components/Upload";
+import { STYLE_OPTIONS, JUMP_OPTIONS } from "/@/config/status";
+import type { FormInstance, FormRules } from "element-plus";
+const ruleFormRef = ref<FormInstance>();
+const emit = defineEmits(["push", "update"]);
+
+const defaultData = {
+  img: "",
+  jump_type: "",
+  jump_param: "",
+  good_id: "",
+  title: "",
+  style_type: ""
+};
+const titleList = ["轮播", "产品宣传", "产品展示", "产品优势"];
+
+const isUpdate = ref(false);
+const visible = ref(false);
+const dataType = ref("");
+const formRef = ref<InstanceType<typeof ElForm> | null>(null);
+const updateIndex = ref("0");
+const formData = ref<Record<string, any>>({ ...defaultData });
+
+let projectFormRules = reactive<FormRules>({
+  img: [{ trigger: "change", required: true, message: "请上传图片" }],
+  jump_type: [
+    {
+      trigger: "change",
+      required: true,
+      message: "请选择跳转类型"
+    }
+  ],
+
+  jump_param: [
+    {
+      trigger: "blur",
+      required: true,
+      message: "请输入跳转地址"
+    }
+  ],
+  style_type: [
+    {
+      trigger: "change",
+      required: true,
+      message: "请选择样式类型"
+    }
+  ],
+  title: [
+    {
+      trigger: "blur",
+      required: true,
+      message: "请输入名称"
+    }
+  ]
+});
+
+const title = computed(() => {
+  return `${isUpdate.value ? "修改" : "添加"}${
+    titleList[Number(dataType.value) - 1]
+  }数据`;
+});
+
+function handleConfirm() {
+  formRef.value.validate(isValid => {
+    if (!isValid) return;
+
+    emit(
+      isUpdate.value ? "update" : "push",
+      unref(formData),
+      unref(updateIndex),
+      unref(dataType)
+    );
+
+    visible.value = false;
+  });
+}
+function jump_type_change(e) {
+  console.log(projectFormRules);
+  projectFormRules["jump_param"][0]["required"] = e + "" !== "1";
+  console.log(projectFormRules);
+}
+
+defineExpose({
+  onDisplay: (index?: string, type?: string, data?: Record<string, any>) => {
+    console.log(index);
+    console.log(type);
+    dataType.value = type ?? "1";
+    projectFormRules["style_type"][0]["required"] = type + "" === "4";
+    if (data) {
+      data.cat_info = [];
+      formData.value = data;
+      updateIndex.value = index ?? "0";
+    }
+
+    visible.value = true;
+    isUpdate.value = !!data;
+  }
+});
+</script>
+
+<template>
+  <ElDialog
+    center
+    :title="title"
+    v-model="visible"
+    @close="() => (formData = { ...defaultData })"
+  >
+    <ElForm
+      ref="formRef"
+      :model="formData"
+      width="500px"
+      :rules="projectFormRules"
+      label-width="100px"
+    >
+      <ElFormItem label="图片" prop="img">
+        <ImageUpload
+          v-model:url="formData.img"
+          :descs="['小于1Mb']"
+          :types="['png', 'jpg', 'jpeg']"
+        />
+      </ElFormItem>
+      <ElFormItem label="标题" prop="title" v-if="dataType === '2'">
+        <ElInput placeholder="标题" v-model="formData.title" />
+      </ElFormItem>
+      <ElFormItem label="跳转类型" prop="jump_type">
+        <el-select
+          v-model="formData.jump_type"
+          @change="jump_type_change"
+          style="width: 100%"
+          placeholder="跳转类型"
+        >
+          <el-option
+            v-for="(item, index) in JUMP_OPTIONS"
+            :label="item.label"
+            :value="item.id"
+            :key="item.id + index"
+          />
+        </el-select>
+      </ElFormItem>
+      <ElFormItem label="跳转地址" prop="jump_param">
+        <ElInput placeholder="跳转地址" v-model="formData.jump_param" />
+      </ElFormItem>
+      <ElFormItem label="样式类型" prop="style_type" v-if="dataType === '4'">
+        <el-select
+          v-model="formData.style_type"
+          style="width: 100%"
+          placeholder="样式类型"
+        >
+          <el-option
+            v-for="(item, index) in STYLE_OPTIONS"
+            :label="item.label"
+            :value="item.id"
+            :key="item.id + index"
+          />
+        </el-select>
+      </ElFormItem>
+      <ElFormItem>
+        <div class="w-full flex justify-end">
+          <ElButton type="primary" @click="handleConfirm">保存</ElButton>
+          <ElButton @click="() => (visible = false)">取消</ElButton>
+        </div>
+      </ElFormItem>
+    </ElForm>
+  </ElDialog>
+</template>

src/views/operate/setTheme/cpns/ladder-table.vue

@@ -0,0 +1,90 @@
+<script setup lang="ts">
+import { useRenderIcon } from "/@/components/ReIcon/src/hooks";
+import { STYLE_OPTIONS, JUMP_OPTIONS } from "/@/config/status";
+const emit = defineEmits(["choose", "delete", "update"]);
+
+defineProps<{
+  ladder: Record<string, any>[];
+  type: string | number;
+  readonly: boolean;
+}>();
+</script>
+
+<template>
+  <ElTable size="small" border :data="ladder">
+    <ElTableColumn prop="name" label="顺序" width="60px">
+      <template #="{ $index }">
+        {{ $index + 1 }}
+      </template>
+    </ElTableColumn>
+    <ElTableColumn prop="img" label="图片" width="50px">
+      <template #="{ $index, row }">
+        <ElImage
+          fit="cover"
+          lazy
+          z-index="99999"
+          :preview-teleported="true"
+          :src="row.img"
+          :preview-src-list="row.img !== '' ? [row.img] : []"
+        /> </template
+    ></ElTableColumn>
+
+    <ElTableColumn prop="jump_type" label="跳转类型" width="85px">
+      <template #="{ row }">
+        <ElTag>{{
+          JUMP_OPTIONS.find(({ id }) => id === row.jump_type + "")?.label ||
+          "--"
+        }}</ElTag>
+      </template>
+    </ElTableColumn>
+    <ElTableColumn prop="jump_param" label="跳转地址" />
+    <ElTableColumn
+      prop="title"
+      label="标题"
+      v-if="type === '2' || type === 2"
+      width="70px"
+    />
+    <ElTableColumn
+      prop="style_type"
+      v-if="type === '4' || type === 4"
+      label="样式类型"
+      width="70px"
+    >
+      <template #="{ row }">
+        <ElTag>{{
+          STYLE_OPTIONS.find(({ id }) => id === row.style_type + "")?.label ||
+          "--"
+        }}</ElTag>
+      </template>
+    </ElTableColumn>
+    <ElTableColumn v-if="!readonly" width="70px">
+      <template #header>
+        <div class="w-full flex justify-between">
+          <p>操作</p>
+
+          <ElTooltip content="添加数据" placement="top">
+            <ElButton
+              link
+              :icon="useRenderIcon('add')"
+              @click="() => emit('choose')"
+            />
+          </ElTooltip>
+        </div>
+      </template>
+
+      <template #="{ $index, row }">
+        <ElButton
+          link
+          v-if="type !== '3' && type !== 3"
+          :icon="useRenderIcon('edits')"
+          @click="() => emit('update', { data: row, index: $index })"
+        />
+        <ElButton
+          link
+          :icon="useRenderIcon('delete')"
+          @click="() => emit('delete', $index)"
+        />
+      </template>
+    </ElTableColumn>
+  </ElTable>
+</template>

src/views/operate/setTheme/cpns/utils/create-basic-title.ts

@@ -0,0 +1,11 @@
+import { ActionType } from "/@/components/PageContent";
+
+const mapActionToBasicTitle = {
+  update: "编辑",
+  create: "新增",
+  preview: "详情"
+};
+
+export function createBasicTitle(type: ActionType) {
+  return mapActionToBasicTitle[type];
+}

src/views/operate/setTheme/cpns/utils/types.ts

@@ -0,0 +1,27 @@
+import { ActionType } from "/@/components/PageContent";
+import pageModal from "../addModel.vue";
+
+export type PageModalInstance = typeof pageModal & {
+  dialogVisible: boolean;
+  confirmLoading: boolean;
+  type: ActionType;
+  title: String;
+};
+export const modalProps = {
+  dialogVisible: {
+    type: Boolean,
+    required: Boolean
+  },
+  confirmLoading: {
+    type: Boolean,
+    default: false
+  },
+  type: {
+    type: Object as PropType<ActionType>,
+    required: true
+  },
+  title: {
+    type: String,
+    required: true
+  }
+};

src/views/operate/setTheme/index.vue

@@ -1,26 +1,38 @@
 <script setup lang="ts">
-import { ref } from "vue";
+import { ref, unref } from "vue";
 import { PageSearch, usePageSearch } from "/@/components/PageSearch";
 import searchConfig from "./config/search.config";
 import contentConfig from "./config/content.config";
-import modalConfig from "./config/modal.config";
-import { PageModal, usePageModal } from "/@/components/PageModal";
 import { PageContent } from "/@/components/PageContent";
-
 import type { PageContentInstance } from "/@/components/PageContent";
+import addModel from "./cpns/addModel.vue";
+const actionModalRef = ref<InstanceType<typeof addModel>>(null);
+
 const pageContentRef = ref<PageContentInstance | null>(null);
 const pageName = "setTheme";
-const {
-  pageModalRef,
-  handleUpdateData,
-  handleCreateData,
-  handlePreviewData,
-  handleConfrim,
-  defaultInfo
-} = usePageModal({
-  pageContentRef
-});
+
 const { handleResetClick, handleSearchClick } = usePageSearch();
+// function handleCreate() {
+//   basicFormRef.value.validate(isValid => {
+//     if (!isValid) return;
+
+//     // handleConfrim("create", {});
+//   });
+// }
+function Create() {
+  pageContentRef.value.getPageData({ id: "" });
+}
+function handleCreateData() {
+  // console.log(actionModalRef.value);
+  // console.log(actionModalRef);
+  actionModalRef.value.onShow("主题设置", "create", "");
+  // actionModalRef.value.confirmLoading = false;
+  // actionModalRef.value.type = "create";
+  // actionModalRef.value.dialogVisible = true;
+}
+function handleData(id, type) {
+  actionModalRef.value.onShow("主题设置", type, id);
+}
 </script>
 
 <template>
@@ -34,14 +46,10 @@ const { handleResetClick, handleSearchClick } = usePageSearch();
     ref="pageContentRef"
     :content-config="contentConfig"
     @create-btn-click="handleCreateData"
-    @preview-btn-click="row => handlePreviewData(row)"
-    @update-btn-click="row => handleUpdateData(row)"
-  />
-  <PageModal
-    ref="pageModalRef"
-    :modal-config="modalConfig"
-    :default-info="defaultInfo"
-    @confirm-btn-click="handleConfrim"
+    @preview-btn-click="({ id }) => handleData(id, 'preview')"
+    @update-btn-click="({ id }) => handleData(id, 'update')"
   />
+  <addModel ref="actionModalRef" @submitOk="Create" />
+
   <!-- </PageAuth> -->
 </template>

src/views/parameter/good/config/_details.ts

@@ -45,6 +45,13 @@ export const projectFormConfig: FormConfig = {
       field: "moq",
       type: "number",
       placeholder: "起订量",
+      otherOptions: {
+        precision: 0,
+        step: 1,
+        "controls-position": "right",
+        min: 0,
+        max: 99999999
+      },
       span: 8
     },
     {
@@ -52,14 +59,28 @@ export const projectFormConfig: FormConfig = {
       field: "step",
       type: "number",
       placeholder: "步长",
-      span: 8
+      span: 8,
+      otherOptions: {
+        precision: 0,
+        step: 1,
+        "controls-position": "right",
+        min: 0,
+        max: 99999999
+      }
     },
     {
       label: "售价",
       field: "price",
-      type: "input",
+      type: "number",
       placeholder: "售价",
-      span: 8
+      span: 8,
+      otherOptions: {
+        precision: 2,
+        step: 1,
+        "controls-position": "right",
+        min: 0,
+        max: 99999999
+      }
     },
     {
       label: "轮播图",

src/views/parameter/good/config/_rules.ts

@@ -100,5 +100,13 @@ export const projectFormRules: FormRules = {
       if (value === "") return new Error("请输入商品参数");
       return true;
     }
+  },
+  good_remark: {
+    trigger: "change",
+    required: true,
+    validator(_, value) {
+      if (!value) return new Error("请输入备注");
+      return true;
+    }
   }
 };

src/views/parameter/good/config/modal.config.ts

@@ -0,0 +1,45 @@
+import { ModalConfig } from "/@/components/PageModal/src/types";
+import { httpList as httpCompanylist } from "/@/api/parameter/company";
+import { httpList as httpCardlist } from "/@/api/parameter/card";
+const modalConfig: ModalConfig = {
+  title: "企业商品",
+  colLayout: { span: 24 },
+  itemStyle: {  },
+  contact: "setComGood",
+  labelWidth: "85px",
+  formItems: [
+    {
+      field: "id",
+      type: "remote-select",
+      label: "业务企业",
+      placeholder: "业务企业",
+      otherOptions: {
+        api: httpCompanylist,
+        requesetProp: "title",
+        responseLabelProp: "title",
+        responseValPro: "id",
+        prop: "list"
+      },
+      span: 12,
+      rules: [{ required: true, trigger: "change", message: "请选择业务企业" }]
+    },
+    {
+      field: "name2",
+      type: "remote-select",
+      label: "卡类型",
+      placeholder: "卡类型",
+      otherOptions: {
+        api: httpCardlist,
+        responseLabelProp: "title",
+        responseValPro: "id",
+        requesetProp: "",
+        isRoot: false,
+        prop: "list"
+      },
+      span: 12,
+      rules: [{ required: true, trigger: "change", message: "请选择卡类型" }]
+    }
+  ]
+};
+
+export default modalConfig;

src/views/parameter/good/config/search.config.ts

@@ -1,7 +1,7 @@
 import { FormConfig } from "/@/components/PageSearch";
-import { STATUS_OPTIONS } from "/@/config/status";
 import { convertOptions } from "/@/utils/column-helper";
 
+import { STATUS_OPTIONS, GOOD_OPTIONS } from "/@/config/status";
 const searchFormConfig: FormConfig = {
   formItems: [
     {
@@ -11,19 +11,20 @@ const searchFormConfig: FormConfig = {
       options: convertOptions(STATUS_OPTIONS)
     },
     {
-      field: "title",
+      field: "good_code",
       type: "input",
-      placeholder: "企业名称"
+      placeholder: "商品编码"
     },
     {
-      field: "contacts",
+      field: "good_name",
       type: "input",
-      placeholder: "联系人"
+      placeholder: "商品名称"
     },
     {
-      field: "mobile",
-      type: "input",
-      placeholder: "联系方式"
+      field: "type",
+      type: "select",
+      placeholder: "商品类型",
+      options: convertOptions(GOOD_OPTIONS)
     }
   ]
 };

src/views/parameter/good/cpns/ladder-modal.vue

@@ -1,13 +1,21 @@
 <script setup lang="ts">
 import { ref, unref, computed } from "vue";
 import { ElForm } from "element-plus";
+import { goodTypeOptions } from "../config/_options";
 import { ladderFormRules } from "../config/_rules";
+import { ImageUpload } from "/@/components/Upload";
+
+import { AmountInput, NumberInput } from "/@/components/Input";
+import GoodClass from "/@/components/GoodClass";
 
 const emit = defineEmits(["push", "update"]);
 
 const defaultData = {
-  key: "",
-  value: ""
+  budget_price: "0.00",
+  good_type: "1",
+  good_name: "",
+  cat_info: [],
+  num: "0"
 };
 
 const isUpdate = ref(false);
@@ -18,7 +26,7 @@ const updateIndex = ref("0");
 const formData = ref<Record<string, any>>({ ...defaultData });
 
 const title = computed(() => {
-  return isUpdate.value ? "修改商品要求" : "添加商品要求";
+  return isUpdate.value ? "修改商品参数" : "添加商品参数";
 });
 
 function handleConfirm() {
@@ -59,17 +67,18 @@ defineExpose({
     <ElForm
       ref="formRef"
       :model="formData"
-      width="500px"
       :rules="ladderFormRules"
       label-width="100px"
+      size="small"
     >
       <ElFormItem label="类型" prop="key">
-        <ElInput placeholder="类型" v-model="formData.key" />
+        <ElInput v-model="formData.key" placeholder="类型" />
       </ElFormItem>
 
       <ElFormItem label="类型值" prop="value">
         <ElInput placeholder="类型值" v-model="formData.value" />
       </ElFormItem>
+
       <ElFormItem>
         <div class="w-full flex justify-end">
           <ElButton type="primary" @click="handleConfirm">保存</ElButton>

src/views/parameter/good/cpns/project-form.vue

@@ -1,94 +0,0 @@
-<script setup lang="ts">
-import { ref, watchEffect, unref } from "vue";
-import { ElForm, ElMessage } from "element-plus";
-import { projectFormConfig } from "../config/_details";
-import { projectFormRules } from "../config/_rules";
-import { BasicForm } from "/@/components/BasicForm";
-import LadderModal from "./ladder-modal.vue";
-import LadderTable from "./ladder-table.vue";
-// import SearchTerrace from "/@/components/SearchTerrace";
-import { Unit } from "/@/components/RemoteSelect";
-import { transform, createDefaultData } from "/@/components/BasicForm";
-import { useResponseHandle } from "/@/hooks/useAsync";
-
-const emit = defineEmits(["create"]);
-
-const props = defineProps<{
-  data: Record<string, string>;
-  readonly: boolean;
-  id?: string;
-}>();
-
-const loading = ref(false);
-const { formItems } = projectFormConfig;
-
-const responseHandle = useResponseHandle();
-const basicFormRef = ref<InstanceType<typeof ElForm>>(null);
-const formData = ref<Record<string, any>>(createDefaultData(formItems));
-const ladderModalRef = ref<InstanceType<typeof LadderModal>>(null);
-
-async function handlePush(_ladder) {
-  formData.value.good_param.push(unref(_ladder));
-}
-
-async function handleUpdate(_ladder, index) {
-  formData.value.good_param[index] = _ladder;
-}
-
-function handleCreate() {
-  basicFormRef.value.validate(isValid => {
-    if (!isValid) return;
-    const params = unref(formData);
-    emit("create", params);
-  });
-}
-
-watchEffect(() => {
-  const { readonly, data } = props;
-  if (readonly && !data) {
-    return;
-  }
-  if (readonly) {
-    formData.value = transform(formItems, data, {});
-  }
-});
-</script>
-
-<template>
-  <ElScrollbar>
-    <BasicForm
-      ref="basicFormRef"
-      v-bind="projectFormConfig"
-      :form-data="formData"
-      :rules="projectFormRules"
-      :disabled="readonly"
-      label-width="120px"
-    >
-      <template #unit_id>
-        <Unit v-model="formData.unit_id" placeholder="单位" />
-      </template>
-
-      <template #good_param>
-        <LadderTable
-          :readonly="readonly"
-          :ladder="formData.good_param"
-          @choose="() => ladderModalRef.onDisplay()"
-          @update="({ data, index }) => ladderModalRef.onDisplay(data, index)"
-          @delete="index => formData.good_param.splice(index, 1)"
-        />
-      </template>
-
-      <template #footer>
-        <div class="w-full flex justify-end" v-if="!readonly">
-          <ElButton type="primary" @click="handleCreate">保存</ElButton>
-        </div>
-      </template>
-    </BasicForm>
-
-    <LadderModal
-      ref="ladderModalRef"
-      @update="handleUpdate"
-      @push="handlePush"
-    />
-  </ElScrollbar>
-</template>

src/views/parameter/good/detail.vue

@@ -1,79 +0,0 @@
-<script setup lang="ts">
-// import CommodityFeedback from "./cpns/commodity-feedback.vue";
-// import ApprovalRecord from "/@/components/ApprovalRecord";
-import PgaeDetail from "/@/components/PageDetail";
-// import SchemePlans from "./cpns/scheme-plan.vue";
-import ProjectForm from "./cpns/project-form.vue";
-import { useAsync } from "/@/hooks/useAsync";
-import { useDetail } from "/@/hooks/useDetail";
-import { useRouter } from "vue-router";
-
-import {
-  httpDetail,
-  httpAdd
-  // httpCommodityFeedback
-} from "/@/api/parameter/good";
-
-//方案制作状态
-// const schemeStatus = ["3", "4", "5", "6"];
-
-const { push } = useRouter();
-
-const { isDetail, collapses, label, id } = useDetail({
-  baseName: "商品",
-  collapseLen: 2
-});
-
-const {
-  data: projectData,
-  run: project,
-  loading: projectLoading
-} = useAsync<Record<string, string>>({
-  initalData: {}
-});
-
-// const {
-//   data: feedbackData,
-//   run: feedback,
-//   loading: feedbackLoading
-// } = useAsync({
-//   initalData: {},
-//   isList: true
-// });
-
-const { run: create } = useAsync({
-  success: () => push("/parameter/good")
-});
-
-const handleCreate = data => create(httpAdd(data));
-
-function initalData() {
-  if (!id.value) {
-    return;
-  }
-
-  project(httpDetail({ id: id.value }));
-  console.log(projectData);
-  // feedback(httpCommodityFeedback({ projectNo: id.value }));
-}
-
-initalData();
-</script>
-
-<template>
-  <PgaeDetail>
-    <ElTabs>
-      <ElTabPane :label="label">
-        <ElCollapse v-model="collapses">
-          <ElCollapseItem :title="label" name="1" v-loading="projectLoading">
-            <ProjectForm
-              :readonly="isDetail"
-              :data="projectData"
-              @create="handleCreate"
-            />
-          </ElCollapseItem>
-        </ElCollapse>
-      </ElTabPane>
-    </ElTabs>
-  </PgaeDetail>
-</template>

src/views/parameter/good/index.vue

@@ -1,40 +1,159 @@
 <script setup lang="ts">
-import { usePageSearch } from "/@/components/PageSearch";
+import { PageSearch, usePageSearch } from "/@/components/PageSearch";
 import searchConfig from "./config/search.config";
 import contentConfig from "./config/content.config";
-import PageAuth from "/@/components/PageAuth";
-import { useRouter } from "vue-router";
+// import PageAuth from "/@/components/PageAuth";
+import { PageModal, usePageModal } from "/@/components/PageModalShell";
+import modalConfig from "./config/modal.config";
+import { PageContent } from "/@/components/PageContent";
+import type { PageContentInstance } from "/@/components/PageContent";
+import { projectFormConfig } from "./config/_details";
+import { projectFormRules } from "./config/_rules";
+import {
+  BasicForm,
+  transform,
+  createDefaultData
+} from "/@/components/BasicForm";
+import { ElImage } from "element-plus";
+import { httpDetail } from "/@/api/parameter/good";
+import { ElForm } from "element-plus";
+import { ref, unref } from "vue";
+// import dayjs from "dayjs";
+import { useResponseHandle } from "/@/hooks/useAsync";
+// import OrderDialog from "/@/components/PageListModal";
+import LadderModal from "./cpns/ladder-modal.vue";
+import LadderTable from "./cpns/ladder-table.vue";
+import { Unit } from "/@/components/RemoteSelect";
+const responseHandle = useResponseHandle();
+const ladderModalRef = ref<InstanceType<typeof LadderModal>>(null);
+// import { httpDetail } from "/@/api/parameter/video";
+const pageContentRef = ref<PageContentInstance | null>(null);
+const {
+  pageModalRef,
+  handleUpdateData,
+  handleCreateData,
+  handlePreviewData,
+  handleConfrim,
+  defaultInfo
+} = usePageModal({
+  pageContentRef
+});
+const { handleResetClick, handleSearchClick } = usePageSearch();
+const { formItems } = projectFormConfig;
+// const modelRef = ref<InstanceType<typeof OrderDialog>>(null);
+const basicFormRef = ref<InstanceType<typeof ElForm>>(null);
+const formData = ref<Record<string, any>>(createDefaultData(formItems));
+// function handleCreate() {
+//   basicFormRef.value.validate(isValid => {
+//     console.log(isValid);
+//     // if (!isValid) return;
 
-import PageContainer, {
-  type Events,
-  type Hooks
-} from "/@/components/PageContainer";
+//     const { group_id, good_id } = formData.value;
+//     if (!group_id || good_id.length == 0) return;
+//     console.log(formData.value);
+//     const params = {
+//       group_id,
+//       good_id: []
+//     };
+//     good_id.forEach(si => {
+//       console.log(si);
+//       params.good_id.push(si.id);
+//     });
+//     handleConfrim("create", params);
+//   });
+// }
+async function handleUpdate(_ladder, index) {
+  formData.value.good_param[index] = _ladder;
+}
 
-const pageName = "good";
+function handleCreate() {
+  basicFormRef.value.validate(isValid => {
+    if (!isValid) return;
+    const params = unref(formData);
+    handleConfrim("create", params);
+    // emit("create", params);
+  });
+}
+async function handlePush(_ladder) {
+  formData.value.good_param.push(unref(_ladder));
+}
+async function handleDetailData(row, type) {
+  const { id } = row;
+  const { code, data, message } = await httpDetail({ id: id });
+  responseHandle({
+    code,
+    message,
+    handler: () => {
+      if (type === "preview") {
+        handlePreviewData(data);
+      }
+      if (type === "update") {
+        formData.value = transform(formItems, data, {});
+        handleUpdateData(data);
+      }
+    }
+  });
+}
 
-const basePath = "/parameter/goodDetail";
-
-const { push } = useRouter();
-
-const hooks: Hooks = {
-  pageSearchHook: () => usePageSearch(undefined, undefined, searchConfig)
-};
-
-const events: Events = {
-  content: {
-    preview: ({ id }) => push(`${basePath}?id=${id}`),
-    create: () => push(basePath)
-  }
-};
+function handleAddOrder(list) {
+  list.forEach(item => {
+    const { id } = item;
+    let findex = formData.value.good_id.findIndex(e => e.id + "" == id + "");
+    if (findex == -1) {
+      formData.value.good_id.push(item);
+    }
+  });
+}
 </script>
 
 <template>
   <!-- <PageAuth :pageName="pageName"> -->
-  <PageContainer
-    :hooks="hooks"
-    :events="events"
-    :search-config="searchConfig"
+  <PageSearch
+    :form-config="searchConfig"
+    @search-btn-click="handleSearchClick"
+    @reset-btn-click="handleResetClick"
+  />
+  <PageContent
+    ref="pageContentRef"
     :content-config="contentConfig"
+    @create-btn-click="handleCreateData"
+    @preview-btn-click="row => handleDetailData(row, 'preview')"
+    @update-btn-click="row => handleDetailData(row, 'update')"
   />
+  <PageModal
+    ref="pageModalRef"
+    :modal-config="modalConfig"
+    :default-info="defaultInfo"
+    @confirm-btn-click="handleConfrim"
+  >
+    <BasicForm
+      ref="basicFormRef"
+      v-bind="projectFormConfig"
+      :form-data="formData"
+      :rules="projectFormRules"
+      :disabled="false"
+      label-width="120px"
+    >
+      <template #unit_id>
+        <Unit v-model="formData.unit_id" placeholder="单位" />
+      </template>
+
+      <template #good_param>
+        <LadderTable
+          :readonly="false"
+          :ladder="formData.good_param"
+          @choose="() => ladderModalRef.onDisplay()"
+          @update="({ data, index }) => ladderModalRef.onDisplay(data, index)"
+          @delete="index => formData.good_param.splice(index, 1)"
+        />
+      </template>
+      <template #footer>
+        <div class="w-full flex justify-end">
+          <ElButton type="primary" @click="handleCreate">保存</ElButton>
+        </div>
+      </template>
+    </BasicForm>
+  </PageModal>
+  <LadderModal ref="ladderModalRef" @update="handleUpdate" @push="handlePush" />
   <!-- </PageAuth> -->
 </template>

src/views/system/updates/config/content.config.ts

@@ -18,8 +18,7 @@ const columns = [
   },
   {
     type: "expand",
-    minWidth: 60,
-    ...renderHtml("content")
+    slot: "expand"
   },
   {
     label: "版本号",

src/views/system/updates/index.vue

@@ -1,27 +1,24 @@
 <script setup lang="ts">
-// import { PageContent } from "/@/components/PageContent";
+import { PageContent } from "/@/components/PageContent";
 import contentConfig from "./config/content.config";
 
-import PageContainer, { type Events } from "/@/components/PageContainer";
-import PageAuth from "/@/components/PageAuth";
-
-const pageName = "updates";
-
-const events: Events = {
-  content: {
-    preview: () => console.log("todo")
-  }
-};
+function transformUpdateInfo(info: string) {
+  const m = "<br/>";
+  const chunks = info.split(m);
+  return chunks;
+}
 </script>
 
 <template>
   <div>
-    <!-- <PageAuth :page-name="pageName"> -->
-    <PageContainer
-      :events="events"
-      :pageName="pageName"
-      :content-config="contentConfig"
-    />
-    <!-- </PageAuth> -->
+    <PageContent :content-config="contentConfig">
+      <template #expand="{ system }">
+        <div class="px-[20px]">
+          <p v-for="(item, index) in transformUpdateInfo(system)" :key="index">
+            {{ item }}
+          </p>
+        </div>
+      </template>
+    </PageContent>
   </div>
 </template>