|
@@ -18,11 +18,11 @@
|
|
|
<byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="formDom" v-loading="submitLoading">
|
|
|
<template #details>
|
|
|
<div style="width:100%">
|
|
|
- <el-table :data="formData.data.data">
|
|
|
- <el-table-column prop="deptName" label="商品编码" min-width="260" />
|
|
|
- <el-table-column prop="type" label="商品名称" width="100" />
|
|
|
- <el-table-column prop="type" label="单价" width="100" />
|
|
|
- <el-table-column prop="type" label="数量" width="100" />
|
|
|
+ <el-table :data="formData.data.items">
|
|
|
+ <el-table-column prop="shopSkuId" label="商品编码" width="170" />
|
|
|
+ <el-table-column prop="name" label="商品名称" />
|
|
|
+ <el-table-column prop="price" label="单价" width="100" />
|
|
|
+ <el-table-column prop="qty" label="数量" width="100" />
|
|
|
</el-table>
|
|
|
</div>
|
|
|
</template>
|
|
@@ -41,6 +41,9 @@
|
|
|
import byTable from "@/components/byTable/index";
|
|
|
import byForm from "@/components/byForm/index";
|
|
|
const { proxy } = getCurrentInstance();
|
|
|
+const jstShopStatus = computed(
|
|
|
+ () => proxy.useUserStore().allDict["jst_status"]
|
|
|
+);
|
|
|
const loading = ref(false);
|
|
|
const submitLoading = ref(false);
|
|
|
const sourceList = ref({
|
|
@@ -55,33 +58,19 @@ const sourceList = ref({
|
|
|
const treeData = ref([]);
|
|
|
const dialogVisible = ref(false);
|
|
|
const modalType = ref("add");
|
|
|
-const statusData = ref([
|
|
|
- {
|
|
|
- label: "未开始",
|
|
|
- value: "0",
|
|
|
- },
|
|
|
- {
|
|
|
- label: "进行中",
|
|
|
- value: "1",
|
|
|
- },
|
|
|
- {
|
|
|
- label: "已完成",
|
|
|
- value: "2",
|
|
|
- },
|
|
|
-]);
|
|
|
const selectConfig = computed(() => [
|
|
|
{
|
|
|
label: "订单状态",
|
|
|
- prop: "produceStatus",
|
|
|
- data: statusData.value,
|
|
|
+ prop: "status",
|
|
|
+ data: jstShopStatus.value,
|
|
|
},
|
|
|
{
|
|
|
type: "time",
|
|
|
label: "订单时间",
|
|
|
placeholder: "开始日期",
|
|
|
- prop: "staDeliveryPeriod",
|
|
|
+ prop: "startTime",
|
|
|
placeholderOne: "结束日期",
|
|
|
- propOne: "endDeliveryPeriod",
|
|
|
+ propOne: "endTime",
|
|
|
},
|
|
|
]);
|
|
|
const config = computed(() => {
|
|
@@ -91,60 +80,73 @@ const config = computed(() => {
|
|
|
label: "内部订单号",
|
|
|
prop: "oid",
|
|
|
slot: "code",
|
|
|
+ width: 110,
|
|
|
},
|
|
|
},
|
|
|
{
|
|
|
attrs: {
|
|
|
label: "分销商",
|
|
|
prop: "drpFrom",
|
|
|
+ "min-width": 120,
|
|
|
},
|
|
|
},
|
|
|
{
|
|
|
attrs: {
|
|
|
label: "订单日期",
|
|
|
prop: "created",
|
|
|
+ width: 160,
|
|
|
},
|
|
|
},
|
|
|
{
|
|
|
attrs: {
|
|
|
label: "订单状态",
|
|
|
- prop: "shopStatus",
|
|
|
+ prop: "status",
|
|
|
+ width: 140,
|
|
|
+ },
|
|
|
+ render(val) {
|
|
|
+ return proxy.dictKeyValue(val, jstShopStatus.value);
|
|
|
},
|
|
|
},
|
|
|
{
|
|
|
attrs: {
|
|
|
label: "订单来源",
|
|
|
prop: "shopSite",
|
|
|
+ width: 110,
|
|
|
},
|
|
|
},
|
|
|
{
|
|
|
attrs: {
|
|
|
label: "店铺",
|
|
|
prop: "shopName",
|
|
|
+ "min-width": 150,
|
|
|
},
|
|
|
},
|
|
|
{
|
|
|
attrs: {
|
|
|
label: "商品",
|
|
|
prop: "skus",
|
|
|
+ "min-width": 150,
|
|
|
},
|
|
|
},
|
|
|
{
|
|
|
attrs: {
|
|
|
label: "应付金额",
|
|
|
prop: "payAmount",
|
|
|
+ width: 100,
|
|
|
},
|
|
|
},
|
|
|
{
|
|
|
attrs: {
|
|
|
label: "已付金额",
|
|
|
prop: "paidAmount",
|
|
|
+ width: 100,
|
|
|
},
|
|
|
},
|
|
|
{
|
|
|
attrs: {
|
|
|
label: "付款时间",
|
|
|
prop: "payDate",
|
|
|
+ width: 160,
|
|
|
},
|
|
|
},
|
|
|
// {
|
|
@@ -239,7 +241,7 @@ getDeptData();
|
|
|
const getList = async (req) => {
|
|
|
sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
|
|
|
loading.value = true;
|
|
|
- proxy.post("/shopInfo/page", sourceList.value.pagination).then((res) => {
|
|
|
+ proxy.post("/jstOrderInfo/page", sourceList.value.pagination).then((res) => {
|
|
|
sourceList.value.data = res.rows;
|
|
|
sourceList.value.pagination.total = res.total;
|
|
|
setTimeout(() => {
|
|
@@ -286,13 +288,11 @@ const getDtl = (row) => {
|
|
|
});
|
|
|
};
|
|
|
|
|
|
-const handleGetDtl = (item) => {
|
|
|
- dialogVisible.value = true;
|
|
|
- modalType.value = "add";
|
|
|
- formData.data = {
|
|
|
- definition: "2",
|
|
|
- fileList: [],
|
|
|
- };
|
|
|
+const handleGetDtl = (row) => {
|
|
|
+ proxy.post("/jstOrderInfo/detail", { id: row.id }).then((res) => {
|
|
|
+ formData.data = res;
|
|
|
+ dialogVisible.value = true;
|
|
|
+ });
|
|
|
};
|
|
|
|
|
|
getList();
|