diff --git a/.env.development b/.env.development index 236bd45..8bcc5d2 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ NODE_ENV = 'development' VITE_NOW_TYPE = 'dist' # Base API -# VITE_APP_BASE_URL='http://192.168.1.22:8546' -VITE_APP_BASE_URL='https://erp.lihaink.cn' \ No newline at end of file +VITE_APP_BASE_URL='http://192.168.1.22:8546' +# VITE_APP_BASE_URL='https://erp.lihaink.cn' \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 277d005..5d11ee5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,6 +21,7 @@ "mavon-editor": "3.0.1", "nprogress": "^0.2.0", "pinia": "^2.0.14", + "print-js": "^1.6.0", "vditor": "^3.9.9", "vue": "^3.2.37", "vue-clipboard3": "^2.0.0", @@ -6233,6 +6234,11 @@ "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": { "version": "1.29.0", "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.29.0.tgz", diff --git a/package.json b/package.json index d76661c..5ca4314 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "mavon-editor": "3.0.1", "nprogress": "^0.2.0", "pinia": "^2.0.14", + "print-js": "^1.6.0", "vditor": "^3.9.9", "vue": "^3.2.37", "vue-clipboard3": "^2.0.0", diff --git a/src/api/opurchaseclass.ts b/src/api/opurchaseclass.ts index 1446c3c..91362a4 100644 --- a/src/api/opurchaseclass.ts +++ b/src/api/opurchaseclass.ts @@ -49,3 +49,9 @@ export function apiOpurchaseinfoListList(params: any) { export function apicreateSupplierGoods(params: any) { return request.post({ url: '/operation/opurchaseclass/createSupplierGoods', params }) } + +// 平台添加采购订单 +export function apioperationOpurchaseclassAdd() { + return request.post({ url: '/operation/opurchaseclass/add' }) +} + diff --git a/src/views/opurchase/opurchaseclass/component/goodsOffer.vue b/src/views/opurchase/opurchaseclass/component/goodsOffer.vue index 06a933c..430cf56 100644 --- a/src/views/opurchase/opurchaseclass/component/goodsOffer.vue +++ b/src/views/opurchase/opurchaseclass/component/goodsOffer.vue @@ -83,7 +83,7 @@
- +
@@ -131,6 +131,7 @@ const route = useRoute(); const queryParams = reactive({ id: route.query.id, is_adopt: "", + is_mer: 1 }); // 分页相关 const { pager, getLists, resetParams, resetPage } = usePaging({ diff --git a/src/views/opurchase/opurchaseclass/component/subOrder.vue b/src/views/opurchase/opurchaseclass/component/subOrder.vue index d054804..85cdfea 100644 --- a/src/views/opurchase/opurchaseclass/component/subOrder.vue +++ b/src/views/opurchase/opurchaseclass/component/subOrder.vue @@ -23,7 +23,7 @@
- +
@@ -41,6 +41,7 @@ const route = useRoute(); const queryParams = reactive({ id: route.query.id, + is_mer: 1 }); // 分页相关 const { pager, getLists, resetParams, resetPage } = usePaging({ diff --git a/src/views/opurchase/opurchaseclass/detail.vue b/src/views/opurchase/opurchaseclass/detail.vue index cdd5962..4169041 100644 --- a/src/views/opurchase/opurchaseclass/detail.vue +++ b/src/views/opurchase/opurchaseclass/detail.vue @@ -36,10 +36,10 @@ - + - + @@ -109,6 +109,7 @@ const { pager, getLists, resetParams, resetPage } = usePaging({ params: { is_push: 0, id: route.query.id }, }); +// getLists() const rePush = async () => { await apicreateSupplierGoods({ id: route.query.id }) @@ -116,7 +117,5 @@ const rePush = async () => { } -// 获取字典数据 -getLists() diff --git a/src/views/opurchase/opurchaseclass/index.vue b/src/views/opurchase/opurchaseclass/index.vue index 59459fa..fb19cd5 100644 --- a/src/views/opurchase/opurchaseclass/index.vue +++ b/src/views/opurchase/opurchaseclass/index.vue @@ -1,24 +1,29 @@ + + + +
+ +
+ + + - diff --git a/src/views/translationOrder/component/goodsOffer.vue b/src/views/translationOrder/component/goodsOffer.vue index 06a933c..43bb37a 100644 --- a/src/views/translationOrder/component/goodsOffer.vue +++ b/src/views/translationOrder/component/goodsOffer.vue @@ -83,7 +83,7 @@
- +
@@ -131,6 +131,7 @@ const route = useRoute(); const queryParams = reactive({ id: route.query.id, is_adopt: "", + is_mer: 2 }); // 分页相关 const { pager, getLists, resetParams, resetPage } = usePaging({ diff --git a/src/views/translationOrder/component/noPush.vue b/src/views/translationOrder/component/noPush.vue new file mode 100644 index 0000000..9e62bbb --- /dev/null +++ b/src/views/translationOrder/component/noPush.vue @@ -0,0 +1,60 @@ + + + diff --git a/src/views/translationOrder/component/subOrder.vue b/src/views/translationOrder/component/subOrder.vue index d054804..33bd01a 100644 --- a/src/views/translationOrder/component/subOrder.vue +++ b/src/views/translationOrder/component/subOrder.vue @@ -18,12 +18,14 @@ />
- +
@@ -41,6 +43,7 @@ const route = useRoute(); const queryParams = reactive({ id: route.query.id, + is_mer: 2 }); // 分页相关 const { pager, getLists, resetParams, resetPage } = usePaging({ diff --git a/src/views/translationOrder/detail.vue b/src/views/translationOrder/detail.vue index 778578f..bd8fb03 100644 --- a/src/views/translationOrder/detail.vue +++ b/src/views/translationOrder/detail.vue @@ -23,7 +23,11 @@ {{ form.merchant_name }} - + @@ -33,24 +37,14 @@ - + - - 重新推送 - - - - - - - - - + @@ -67,7 +61,7 @@ import { import { useRoute } from "vue-router"; import subOrder from "./component/subOrder.vue"; import goodsOffer from "./component/goodsOffer.vue"; -import { apiOpurchaseinfoListList, apicreateSupplierGoods } from "@/api/opurchaseclass"; +import noPush from "./component/noPush.vue"; const route = useRoute(); const form = ref({}); @@ -91,28 +85,13 @@ getDetail(); const subOrderRef = ref(null); const goodsOfferRef = ref(null); +const noPushRef = ref(null); const tabChange = (type: any) => { if (!activeMap.value.get(type)) { + activeMap.value.set(type, true); if (type == "order") subOrderRef.value?.getLists(); if (type == "offer") goodsOfferRef.value?.getLists(); - activeMap.value.set(type, true); + if (type == "notPushedGoods") noPushRef.value?.getLists(); } }; - - -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() diff --git a/src/views/translationOrder/index.vue b/src/views/translationOrder/index.vue index 19ced60..52b1906 100644 --- a/src/views/translationOrder/index.vue +++ b/src/views/translationOrder/index.vue @@ -5,9 +5,9 @@ - + @@ -35,7 +35,7 @@ - + @@ -43,7 +43,11 @@ - + + +