weipengfei
/
ERP-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: weipengfei:05ef31fdbe53e0553f69a0e25cbaceffd629520e
Branches Tags
weipengfei:main
..
compare: weipengfei:ba57aae0fc782ad07a56385989426cecc9fcadb0
Branches Tags
weipengfei:main

No commits in common. "05ef31fdbe53e0553f69a0e25cbaceffd629520e" and "ba57aae0fc782ad07a56385989426cecc9fcadb0" have entirely different histories.
05ef31fdbe ... ba57aae0fc

14 changed files with 3440 additions and 3619 deletions
Show Stats Expand all files Collapse all files

4
.env.development
View File

@ -1,5 +1,5 @@
NODE_ENV = 'development' NODE_ENV = 'development'
VITE_NOW_TYPE = 'dist' VITE_NOW_TYPE = 'dist'
# Base API # Base API
VITE_APP_BASE_URL='http://192.168.1.22:8546' # VITE_APP_BASE_URL='http://192.168.1.22:8546'
# VITE_APP_BASE_URL='https://erp.lihaink.cn' VITE_APP_BASE_URL='https://erp.lihaink.cn'

6
package-lock.json generated
View File

@ -21,7 +21,6 @@
"mavon-editor": "3.0.1", "mavon-editor": "3.0.1",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
"pinia": "^2.0.14", "pinia": "^2.0.14",
"print-js": "^1.6.0",
"vditor": "^3.9.9", "vditor": "^3.9.9",
"vue": "^3.2.37", "vue": "^3.2.37",
"vue-clipboard3": "^2.0.0", "vue-clipboard3": "^2.0.0",
@ -6234,11 +6233,6 @@
"node": ">=6.0.0" "node": ">=6.0.0"
} }
}, },
"node_modules/print-js": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/print-js/-/print-js-1.6.0.tgz",
"integrity": "sha512-BfnOIzSKbqGRtO4o0rnj/K3681BSd2QUrsIZy/+WdCIugjIswjmx3lDEZpXB2ruGf9d4b3YNINri81+J0FsBWg=="
},
"node_modules/prismjs": { "node_modules/prismjs": {
"version": "1.29.0", "version": "1.29.0",
"resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.29.0.tgz", "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.29.0.tgz",

1
package.json
View File

@ -23,7 +23,6 @@
"mavon-editor": "3.0.1", "mavon-editor": "3.0.1",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
"pinia": "^2.0.14", "pinia": "^2.0.14",
"print-js": "^1.6.0",
"vditor": "^3.9.9", "vditor": "^3.9.9",
"vue": "^3.2.37", "vue": "^3.2.37",
"vue-clipboard3": "^2.0.0", "vue-clipboard3": "^2.0.0",

6
src/api/opurchaseclass.ts
View File

@ -49,9 +49,3 @@ export function apiOpurchaseinfoListList(params: any) {
export function apicreateSupplierGoods(params: any) { export function apicreateSupplierGoods(params: any) {
return request.post({ url: '/operation/opurchaseclass/createSupplierGoods', params }) return request.post({ url: '/operation/opurchaseclass/createSupplierGoods', params })
} }
// 平台添加采购订单
export function apioperationOpurchaseclassAdd() {
return request.post({ url: '/operation/opurchaseclass/add' })
}

3
src/views/opurchase/opurchaseclass/component/goodsOffer.vue
View File

@ -83,7 +83,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="flex mt-4 justify-end"> <div class="flex mt-4 justify-end">
<pagination v-if="pager.lists" v-model="pager" @change="getLists" /> <pagination v-model="pager" @change="getLists" />
</div> </div>
<el-dialog v-model="dialogVisible" title="入库" width="600"> <el-dialog v-model="dialogVisible" title="入库" width="600">
<el-descriptions class="margin-top" :column="1" border> <el-descriptions class="margin-top" :column="1" border>
@ -131,7 +131,6 @@ const route = useRoute();
const queryParams = reactive({ const queryParams = reactive({
id: route.query.id, id: route.query.id,
is_adopt: "", is_adopt: "",
is_mer: 1
}); });
// 分页相关 // 分页相关
const { pager, getLists, resetParams, resetPage } = usePaging({ const { pager, getLists, resetParams, resetPage } = usePaging({

3
src/views/opurchase/opurchaseclass/component/subOrder.vue
View File

@ -23,7 +23,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="flex mt-4 justify-end"> <div class="flex mt-4 justify-end">
<pagination v-if="pager.lists" v-model="pager" @change="getLists" /> <pagination v-model="pager" @change="getLists" />
</div> </div>
<detail ref="detailRef" v-if="showDetail" :dictData="dictData" <detail ref="detailRef" v-if="showDetail" :dictData="dictData"
@close="showDetail = false"/> @close="showDetail = false"/>
@ -41,7 +41,6 @@ const route = useRoute();
const queryParams = reactive({ const queryParams = reactive({
id: route.query.id, id: route.query.id,
is_mer: 1
}); });
// 分页相关 // 分页相关
const { pager, getLists, resetParams, resetPage } = usePaging({ const { pager, getLists, resetParams, resetPage } = usePaging({

9
src/views/opurchase/opurchaseclass/detail.vue
View File

@ -36,10 +36,10 @@
<el-table-column prop="nums_count" label="已采纳数量" /> <el-table-column prop="nums_count" label="已采纳数量" />
</el-table> </el-table>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="摊贩订单" name="order"> <el-tab-pane label="子订单" name="order">
<subOrder ref="subOrderRef" /> <subOrder ref="subOrderRef" />
</el-tab-pane> </el-tab-pane>
<!-- <el-tab-pane label="报价列表" name="offer"> <el-tab-pane label="报价列表" name="offer">
<goodsOffer ref="goodsOfferRef" /> <goodsOffer ref="goodsOfferRef" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="未推送商品" name="notPushedGoods"> <el-tab-pane label="未推送商品" name="notPushedGoods">
@ -54,7 +54,7 @@
<el-table-column prop="total" label="合计(元)" /> <el-table-column prop="total" label="合计(元)" />
<el-table-column label="备注" prop="data" show-overflow-tooltip /> <el-table-column label="备注" prop="data" show-overflow-tooltip />
</el-table> </el-table>
</el-tab-pane> --> </el-tab-pane>
</el-tabs> </el-tabs>
</el-card> </el-card>
</div> </div>
@ -109,7 +109,6 @@ const { pager, getLists, resetParams, resetPage } = usePaging({
params: { is_push: 0, id: route.query.id }, params: { is_push: 0, id: route.query.id },
}); });
// getLists()
const rePush = async () => { const rePush = async () => {
await apicreateSupplierGoods({ id: route.query.id }) await apicreateSupplierGoods({ id: route.query.id })
@ -117,5 +116,7 @@ const rePush = async () => {
} }
// 获取字典数据
getLists()
</script> </script>

294
src/views/opurchase/opurchaseclass/index.vue
View File

@ -1,29 +1,24 @@
<template> <template>
<div> <div>
<el-card class="!border-none mb-4" shadow="never"> <el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline> <el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="所属商户" prop="merchant"> <el-form-item label="所属商户" prop="merchant">
<el-input <el-input class="w-[280px]" v-model="queryParams.merchant" clearable placeholder="请输入所属商户" />
class="w-[280px]" </el-form-item>
v-model="queryParams.merchant" <el-form-item label="零售订单id" prop="order_arr">
clearable
placeholder="请输入所属商户"
/>
</el-form-item>
<!-- <el-form-item label="零售订单id" prop="order_arr">
<el-input class="w-[280px]" v-model="queryParams.order_arr" clearable placeholder="请输入零售订单id" /> <el-input class="w-[280px]" v-model="queryParams.order_arr" clearable placeholder="请输入零售订单id" />
</el-form-item> --> </el-form-item>
<!-- <el-form-item label="单据编号" prop="number"> <!-- <el-form-item label="单据编号" prop="number">
<el-input class="w-[280px]" v-model="queryParams.number" clearable placeholder="请输入单据编号" /> <el-input class="w-[280px]" v-model="queryParams.number" clearable placeholder="请输入单据编号" />
</el-form-item> --> </el-form-item> -->
<el-form-item> <el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button> <el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button> <el-button @click="resetParams">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-card> </el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never"> <el-card class="!border-none" v-loading="pager.loading" shadow="never">
<!-- <el-button v-perms="['operation.opurchaseclass/add']" type="primary" @click="handleAdd"> <!-- <el-button v-perms="['operation.opurchaseclass/add']" type="primary" @click="handleAdd">
<template #icon> <template #icon>
<icon name="el-icon-Plus" /> <icon name="el-icon-Plus" />
</template> </template>
@ -36,82 +31,25 @@
> >
删除 删除
</el-button> --> </el-button> -->
<el-button <div class="mt-4">
v-perms="['operation.opurchaseclass/add']" <el-table :data="pager.lists" @selection-change="handleSelectionChange">
type="primary" <el-table-column type="selection" width="55" />
@click="submitOrder" <el-table-column label="ID" prop="id" show-overflow-tooltip />
> <el-table-column label="所属商户" prop="merchant_name" show-overflow-tooltip />
<template #icon> <el-table-column label="零售订单id" prop="order_arr" show-overflow-tooltip />
<icon name="el-icon-Plus" /> <el-table-column label="购物车id" prop="cart_id" show-overflow-tooltip />
</template> <el-table-column label="单据编号" prop="number" width="220" show-overflow-tooltip />
提交今日商户采购订单 <el-table-column label="单据金额" prop="total" show-overflow-tooltip />
</el-button> <el-table-column label="抵扣金额" prop="deduction_price" show-overflow-tooltip />
<el-button <el-table-column label="实际金额" prop="actual" show-overflow-tooltip />
v-perms="['operation.opurchaseclass/add']" <el-table-column label="实收金额" prop="money" show-overflow-tooltip />
type="success" <el-table-column label="是否支付" prop="paid" show-overflow-tooltip />
@click="onPrintOrder" <el-table-column label="操作" width="120" fixed="right">
> <template #default="{ row }">
<template #icon> <el-button type="primary" link @click="handleDetail(row)">
<icon name="el-icon-Printer" /> 详情
</template> </el-button>
打印 <!-- <el-button
</el-button>
<div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column label="ID" prop="id" show-overflow-tooltip />
<el-table-column
label="所属商户"
prop="merchant_name"
show-overflow-tooltip
/>
<el-table-column
label="零售订单id"
prop="order_arr"
show-overflow-tooltip
/>
<el-table-column
label="购物车id"
prop="cart_id"
show-overflow-tooltip
/>
<el-table-column
label="单据编号"
prop="number"
width="220"
show-overflow-tooltip
/>
<el-table-column
label="单据金额"
prop="total"
show-overflow-tooltip
/>
<el-table-column
label="抵扣金额"
prop="deduction_price"
show-overflow-tooltip
/>
<el-table-column
label="实际金额"
prop="actual"
show-overflow-tooltip
/>
<el-table-column
label="实收金额"
prop="money"
show-overflow-tooltip
/>
<el-table-column label="是否支付" prop="paid" show-overflow-tooltip>
<template #default="{ row }">
<span>{{ row.paid ? "是" : "否" }}</span>
</template>
</el-table-column>
<el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }">
<el-button type="primary" link @click="handleDetail(row)">
详情
</el-button>
<!-- <el-button
v-perms="['operation.opurchaseclass/edit']" v-perms="['operation.opurchaseclass/edit']"
type="primary" type="primary"
link link
@ -127,141 +65,91 @@
> >
删除 删除
</el-button> --> </el-button> -->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<div class="flex mt-4 justify-end"> <div class="flex mt-4 justify-end">
<pagination v-model="pager" @change="getLists" /> <pagination v-model="pager" @change="getLists" />
</div> </div>
</el-card> </el-card>
<edit-popup <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
v-if="showEdit" </div>
ref="editRef"
:dict-data="dictData"
@success="getLists"
@close="showEdit = false"
/>
</div>
</template> </template>
<script lang="ts" setup name="opurchaseclassLists"> <script lang="ts" setup name="opurchaseclassLists">
import { usePaging } from "@/hooks/usePaging"; import { usePaging } from '@/hooks/usePaging'
import { useDictData } from "@/hooks/useDictOptions"; import { useDictData } from '@/hooks/useDictOptions'
import { import { apiOpurchaseclassLists, apiOpurchaseclassDelete } from '@/api/opurchaseclass'
apiOpurchaseclassLists, import { timeFormat } from '@/utils/util'
apiOpurchaseclassDelete, import feedback from '@/utils/feedback'
apioperationOpurchaseclassAdd, import EditPopup from './edit.vue'
} from "@/api/opurchaseclass"; import { useRouter } from 'vue-router'
import { timeFormat } from "@/utils/util";
import feedback from "@/utils/feedback";
import EditPopup from "./edit.vue";
import { useRouter } from "vue-router";
import print from "print-js";
const router = useRouter(); const router = useRouter()
const editRef = shallowRef<InstanceType<typeof EditPopup>>(); const editRef = shallowRef<InstanceType<typeof EditPopup>>()
// 是否显示编辑框 // 是否显示编辑框
const showEdit = ref(false); const showEdit = ref(false)
// 查询条件 // 查询条件
const queryParams = reactive({ const queryParams = reactive({
merchant: "", merchant: '',
order_arr: "", order_arr: '',
number: "", number: ''
is_mer: 1, // 1是商户，2是平台 })
});
// 选中数据 // 选中数据
const selectData = ref<any[]>([]); const selectData = ref<any[]>([])
// 表格选择后回调事件 // 表格选择后回调事件
const handleSelectionChange = (val: any[]) => { const handleSelectionChange = (val: any[]) => {
selectData.value = val.map(({ id }) => id); selectData.value = val.map(({ id }) => id)
}; }
// 获取字典数据 // 获取字典数据
const { dictData } = useDictData(""); const { dictData } = useDictData('')
// 分页相关 // 分页相关
const { pager, getLists, resetParams, resetPage } = usePaging({ const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apiOpurchaseclassLists, fetchFun: apiOpurchaseclassLists,
params: queryParams, params: queryParams
}); })
// 添加 // 添加
const handleAdd = async () => { const handleAdd = async () => {
showEdit.value = true; showEdit.value = true
await nextTick(); await nextTick()
editRef.value?.open("add"); editRef.value?.open('add')
}; }
// 提交订单
const submitOrder = async () => {
apioperationOpurchaseclassAdd().then((res) => {
ElMessage.success("提交成功");
});
};
// 打印订单
const onPrintOrder = async () => {
var someJSONdata = [
{
name: "John Doe",
email: "john@doe.com",
phone: "111-111-1111",
},
{
name: "Barry Allen",
email: "barry@flash.com",
phone: "222-222-2222",
},
{
name: "Cool Dude",
email: "cool@dude.com",
phone: "333-333-3333",
},
];
print({
printable: someJSONdata,
type: "json",
properties: [
{ field: "name", displayName: "自定义表头" },
{ field: "email", displayName: "自定义表头" },
{ field: "phone", displayName: "自定义表头" },
],
maxWidth: 58,
gridHeaderStyle: "color: red; border: 2px solid #3971A5;",
gridStyle: "border: 2px solid #3971A5;",
});
};
// 详情 // 详情
const handleDetail = async (data: any) => { const handleDetail = async (data: any) => {
console.log(data); console.log(data);
router.push({ router.push({
path: "detail", path: 'detail',
query: { query: {
id: data.id, id: data.id
}, }
}); })
}; }
// 编辑 // 编辑
const handleEdit = async (data: any) => { const handleEdit = async (data: any) => {
showEdit.value = true; showEdit.value = true
await nextTick(); await nextTick()
editRef.value?.open("edit"); editRef.value?.open('edit')
editRef.value?.setFormData(data); editRef.value?.setFormData(data)
}; }
// 删除 // 删除
const handleDelete = async (id: number | any[]) => { const handleDelete = async (id: number | any[]) => {
await feedback.confirm("确定要删除？"); await feedback.confirm('确定要删除？')
await apiOpurchaseclassDelete({ id }); await apiOpurchaseclassDelete({ id })
getLists(); getLists()
}; }
getLists(); getLists()
</script> </script>

3
src/views/translationOrder/component/goodsOffer.vue
View File

@ -83,7 +83,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="flex mt-4 justify-end"> <div class="flex mt-4 justify-end">
<pagination v-if="pager.lists" v-model="pager" @change="getLists" /> <pagination v-model="pager" @change="getLists" />
</div> </div>
<el-dialog v-model="dialogVisible" title="入库" width="600"> <el-dialog v-model="dialogVisible" title="入库" width="600">
<el-descriptions class="margin-top" :column="1" border> <el-descriptions class="margin-top" :column="1" border>
@ -131,7 +131,6 @@ const route = useRoute();
const queryParams = reactive({ const queryParams = reactive({
id: route.query.id, id: route.query.id,
is_adopt: "", is_adopt: "",
is_mer: 2
}); });
// 分页相关 // 分页相关
const { pager, getLists, resetParams, resetPage } = usePaging({ const { pager, getLists, resetParams, resetPage } = usePaging({

60
src/views/translationOrder/component/noPush.vue
View File

@ -1,60 +0,0 @@
<template>
<div>
<el-button type="primary" @click="rePush" style="margin-bottom: 16px;"> 重新推送 </el-button>
<el-table :data="pager.lists">
<el-table-column
label="商品名称"
prop="goods_name"
show-overflow-tooltip
/>
<el-table-column
label="商品标签"
prop="sys_labels_arr"
show-overflow-tooltip
/>
<el-table-column label="单位" prop="unit_name" show-overflow-tooltip />
<el-table-column label="单价(元)" prop="price" show-overflow-tooltip />
<el-table-column prop="nums" label="数量" />
<el-table-column prop="total" label="合计(元)" />
<el-table-column label="备注" prop="data" show-overflow-tooltip />
</el-table>
<div class="flex mt-4 justify-end">
<pagination v-if="pager.lists" v-model="pager" @change="getLists" />
</div>
</div>
</template>
<script lang="ts" setup name="subOrder">
import { usePaging } from "@/hooks/usePaging";
import { useDictData } from "@/hooks/useDictOptions";
import {
apiOpurchaseinfoListList,
apicreateSupplierGoods,
} from "@/api/opurchaseclass";
import { useRoute } from "vue-router";
const route = useRoute();
const queryParams = reactive({
is_push: 0,
id: route.query.id,
is_mer: 2,
sys_labels_arr: "",
});
// 分页相关
const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apiOpurchaseinfoListList,
params: queryParams,
});
defineExpose({
getLists,
});
// 获取字典数据
const { dictData } = useDictData("pay_type,auditing_type");
const rePush = async () => {
await apicreateSupplierGoods({ id: route.query.id });
};
</script>

7
src/views/translationOrder/component/subOrder.vue
View File

@ -18,14 +18,12 @@
/> />
<el-table-column label="操作" fixed="right"> <el-table-column label="操作" fixed="right">
<template #default="{ row }"> <template #default="{ row }">
<router-link :to="`/opurchase/detail?id=${row.id}`"> <el-button type="primary" @click="openDetail(row)" link>详情</el-button>
<el-button type="primary" link>详情</el-button>
</router-link>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="flex mt-4 justify-end"> <div class="flex mt-4 justify-end">
<pagination v-if="pager.lists" v-model="pager" @change="getLists" /> <pagination v-model="pager" @change="getLists" />
</div> </div>
<detail ref="detailRef" v-if="showDetail" :dictData="dictData" <detail ref="detailRef" v-if="showDetail" :dictData="dictData"
@close="showDetail = false"/> @close="showDetail = false"/>
@ -43,7 +41,6 @@ const route = useRoute();
const queryParams = reactive({ const queryParams = reactive({
id: route.query.id, id: route.query.id,
is_mer: 2
}); });
// 分页相关 // 分页相关
const { pager, getLists, resetParams, resetPage } = usePaging({ const { pager, getLists, resetParams, resetPage } = usePaging({

43
src/views/translationOrder/detail.vue
View File

@ -29,11 +29,7 @@
{{ form.merchant_name }} {{ form.merchant_name }}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-table <el-table :data="form.goods_info" border style="width: 100%; margin-top: 20px">
:data="form.goods_info"
border
style="width: 100%; margin-top: 20px"
>
<el-table-column prop="id" label="ID" width="120" /> <el-table-column prop="id" label="ID" width="120" />
<el-table-column prop="goods_name" label="商品名称" /> <el-table-column prop="goods_name" label="商品名称" />
<el-table-column prop="price" label="单价(元)" /> <el-table-column prop="price" label="单价(元)" />
@ -43,14 +39,24 @@
<el-table-column prop="nums_count" label="已采纳数量" /> <el-table-column prop="nums_count" label="已采纳数量" />
</el-table> </el-table>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="商户订单" name="order"> <el-tab-pane label="子订单" name="order">
<subOrder ref="subOrderRef" /> <subOrder ref="subOrderRef" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="报价列表" name="offer"> <el-tab-pane label="报价列表" name="offer">
<goodsOffer ref="goodsOfferRef" /> <goodsOffer ref="goodsOfferRef" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="未推送商品" name="notPushedGoods"> <el-tab-pane label="未推送商品" name="notPushedGoods">
<noPush ref="noPushRef" /> <el-button type="primary" @click="rePush">
重新推送
</el-button>
<el-table :data="pager.lists">
<el-table-column label="商品名称" prop="goods_name" show-overflow-tooltip />
<el-table-column label="单位" prop="unit_name" show-overflow-tooltip />
<el-table-column label="单价(元)" prop="price" show-overflow-tooltip />
<el-table-column prop="nums" label="数量" />
<el-table-column prop="total" label="合计(元)" />
<el-table-column label="备注" prop="data" show-overflow-tooltip />
</el-table>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</el-card> </el-card>
@ -71,7 +77,7 @@ import {
import { useRoute } from "vue-router"; import { useRoute } from "vue-router";
import subOrder from "./component/subOrder.vue"; import subOrder from "./component/subOrder.vue";
import goodsOffer from "./component/goodsOffer.vue"; import goodsOffer from "./component/goodsOffer.vue";
import noPush from "./component/noPush.vue"; import { apiOpurchaseinfoListList, apicreateSupplierGoods } from "@/api/opurchaseclass";
const route = useRoute(); const route = useRoute();
const form = ref({}); const form = ref({});
@ -95,13 +101,28 @@ getDetail();
const subOrderRef = ref(null); const subOrderRef = ref(null);
const goodsOfferRef = ref(null); const goodsOfferRef = ref(null);
const noPushRef = ref(null);
const tabChange = (type: any) => { const tabChange = (type: any) => {
if (!activeMap.value.get(type)) { if (!activeMap.value.get(type)) {
activeMap.value.set(type, true);
if (type == "order") subOrderRef.value?.getLists(); if (type == "order") subOrderRef.value?.getLists();
if (type == "offer") goodsOfferRef.value?.getLists(); if (type == "offer") goodsOfferRef.value?.getLists();
if (type == "notPushedGoods") noPushRef.value?.getLists(); activeMap.value.set(type, true);
} }
}; };
const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apiOpurchaseinfoListList,
params: { is_push: 0, id: route.query.id },
});
const rePush = async () => {
await apicreateSupplierGoods({ id: route.query.id })
getLists()
}
// 获取字典数据
getLists()
</script> </script>

15
src/views/translationOrder/index.vue
View File

@ -5,9 +5,9 @@
<el-form-item label="所属商户" prop="merchant"> <el-form-item label="所属商户" prop="merchant">
<el-input class="w-[280px]" v-model="queryParams.merchant" clearable placeholder="请输入所属商户" /> <el-input class="w-[280px]" v-model="queryParams.merchant" clearable placeholder="请输入所属商户" />
</el-form-item> </el-form-item>
<!-- <el-form-item label="零售订单id" prop="order_arr"> <el-form-item label="零售订单id" prop="order_arr">
<el-input class="w-[280px]" v-model="queryParams.order_arr" clearable placeholder="请输入零售订单id" /> <el-input class="w-[280px]" v-model="queryParams.order_arr" clearable placeholder="请输入零售订单id" />
</el-form-item> --> </el-form-item>
<!-- <el-form-item label="单据编号" prop="number"> <!-- <el-form-item label="单据编号" prop="number">
<el-input class="w-[280px]" v-model="queryParams.number" clearable placeholder="请输入单据编号" /> <el-input class="w-[280px]" v-model="queryParams.number" clearable placeholder="请输入单据编号" />
</el-form-item> --> </el-form-item> -->
@ -35,7 +35,7 @@
<el-table :data="pager.lists" @selection-change="handleSelectionChange"> <el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
<el-table-column label="ID" prop="id" show-overflow-tooltip /> <el-table-column label="ID" prop="id" show-overflow-tooltip />
<el-table-column label="所属商户" prop="merchant_name" show-overflow-tooltip /> <!-- <el-table-column label="所属商户" prop="merchant_name" show-overflow-tooltip /> -->
<!-- <el-table-column label="零售订单id" prop="order_arr" show-overflow-tooltip /> --> <!-- <el-table-column label="零售订单id" prop="order_arr" show-overflow-tooltip /> -->
<el-table-column label="购物车id" prop="cart_id" show-overflow-tooltip /> <el-table-column label="购物车id" prop="cart_id" show-overflow-tooltip />
<el-table-column label="单据编号" prop="number" width="220" show-overflow-tooltip /> <el-table-column label="单据编号" prop="number" width="220" show-overflow-tooltip />
@ -43,11 +43,7 @@
<el-table-column label="抵扣金额" prop="deduction_price" show-overflow-tooltip /> <el-table-column label="抵扣金额" prop="deduction_price" show-overflow-tooltip />
<el-table-column label="实际金额" prop="actual" show-overflow-tooltip /> <el-table-column label="实际金额" prop="actual" show-overflow-tooltip />
<el-table-column label="实收金额" prop="money" show-overflow-tooltip /> <el-table-column label="实收金额" prop="money" show-overflow-tooltip />
<el-table-column label="是否支付" prop="paid"> <el-table-column label="是否支付" prop="paid" show-overflow-tooltip />
<template #default="{ row }">
<span>{{ row.paid ? '是' : '否' }}</span>
</template>
</el-table-column>
<el-table-column label="操作" width="120" fixed="right"> <el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }"> <template #default="{ row }">
<el-button type="primary" link @click="handleDetail(row)"> <el-button type="primary" link @click="handleDetail(row)">
@ -101,8 +97,7 @@ const showEdit = ref(false)
const queryParams = reactive({ const queryParams = reactive({
merchant: '', merchant: '',
order_arr: '', order_arr: '',
number: '', number: ''
is_mer: 2 // 1是商户，2是平台
}) })
// 选中数据 // 选中数据

6605
yarn.lock
View File

File diff suppressed because it is too large Load Diff