Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web

This commit is contained in:
LiJianZhao 2025-05-27 16:04:25 +08:00
commit c0eb4f00d6
7 changed files with 20 additions and 14 deletions

View File

@ -140,7 +140,7 @@ const changeTime = () => {
if (type.value == '1') { if (type.value == '1') {
init() init()
} else { } else {
post("inventory/goods/getInventoryLog", { post(API.Inventory.Goods.Log, {
goodsId: props.id, goodsId: props.id,
startDate: formatDate(dateList.value[0]), startDate: formatDate(dateList.value[0]),
endDate: formatDate(dateList.value[1]) endDate: formatDate(dateList.value[1])

View File

@ -30,6 +30,7 @@ import {post} from "@/utils/request.ts";
import {loadConfig} from "@/utils/config.ts"; import {loadConfig} from "@/utils/config.ts";
import {Plus} from "@element-plus/icons-vue"; import {Plus} from "@element-plus/icons-vue";
import axios from "axios"; import axios from "axios";
import {API} from "@/assets/config/API.ts";
const isShow = defineModel() const isShow = defineModel()
const props = {multiple: true} const props = {multiple: true}
@ -59,7 +60,7 @@ const toExcel = () => {
cateIdList.push(item[1]) cateIdList.push(item[1])
} }
} }
post("inventory/order/toExcel", {cateIdList: cateIdList}).then((token: any) => { post(API.Inventory.Order.ToExcel, {cateIdList: cateIdList}).then((token: any) => {
loadConfig().then((res: any) => { loadConfig().then((res: any) => {
window.open(res.base_url + "file/download/" + token) window.open(res.base_url + "file/download/" + token)
}) })
@ -68,7 +69,7 @@ const toExcel = () => {
} }
const getAllCate = () => { const getAllCate = () => {
post("goods/cate/getAllList", null).then((res: any) => { post(API.Goods.Cate.GetAllList, null).then((res: any) => {
const options = []; const options = [];
for (const key in res) { for (const key in res) {
if (typeList.hasOwnProperty(key)) { // if (typeList.hasOwnProperty(key)) { //
@ -134,7 +135,7 @@ const uploadFile = async () => {
'Content-Type': 'multipart/form-data' 'Content-Type': 'multipart/form-data'
} }
}); });
let excelData = await post("inventory/order/fromExcel", {token: response.data}) let excelData = await post(API.Inventory.Order.FromExcel, {token: response.data})
close() close()
emit('initAddOrderData',excelData) emit('initAddOrderData',excelData)
} catch (error) { } catch (error) {

View File

@ -96,6 +96,7 @@ import {nextTick, onMounted, ref} from "vue";
import {post} from "@/utils/request.ts"; import {post} from "@/utils/request.ts";
import DetailApply from "@/components/inventory/apply/DetailApply.vue"; import DetailApply from "@/components/inventory/apply/DetailApply.vue";
import {formatDateArray, getEndOfDay} from "@/utils/dateUtils.ts"; import {formatDateArray, getEndOfDay} from "@/utils/dateUtils.ts";
import {API} from "@/assets/config/API.ts";
const is_add = ref(false) const is_add = ref(false)
const is_detail = ref(false) const is_detail = ref(false)
@ -106,7 +107,7 @@ const getList = () => {
pageSize: 20, pageSize: 20,
...searchModel.value, ...searchModel.value,
} }
post("inventory/apply/list", {query: query}).then((res: any) => { post(API.Inventory.Apply.List, {query: query}).then((res: any) => {
dataList.value = res.list dataList.value = res.list
total.value = res.total_count total.value = res.total_count
}) })

View File

@ -99,6 +99,7 @@ import Add from "@/components/inventory/check/Add.vue";
import Detail from "@/components/inventory/check/Detail.vue"; import Detail from "@/components/inventory/check/Detail.vue";
import {Plus, Refresh, Search} from "@element-plus/icons-vue"; import {Plus, Refresh, Search} from "@element-plus/icons-vue";
import {formatDateArray, getEndOfDay} from "@/utils/dateUtils.ts"; import {formatDateArray, getEndOfDay} from "@/utils/dateUtils.ts";
import {API} from "@/assets/config/API.ts";
const tableData = ref([]) const tableData = ref([])
const getCheck = () => { const getCheck = () => {
@ -107,7 +108,7 @@ const getCheck = () => {
pageSize: pageSize.value, pageSize: pageSize.value,
...searchModel.value, ...searchModel.value,
} }
post("inventory/check/list", {query: query}).then( post(API.Inventory.Check.List, {query: query}).then(
(res: any) => { (res: any) => {
tableData.value = res.list tableData.value = res.list
total.value = res.total_count total.value = res.total_count

View File

@ -215,6 +215,7 @@ import InventoryBatchDetail from "@/components/inventory/goods/InventoryBatchDet
import InventoryStatistics from "@/components/inventory/goods/InventoryStatistics.vue"; import InventoryStatistics from "@/components/inventory/goods/InventoryStatistics.vue";
import CloseBtn from "@/components/CloseBtn.vue"; import CloseBtn from "@/components/CloseBtn.vue";
import {Search, SemiSelect, Refresh} from "@element-plus/icons-vue"; import {Search, SemiSelect, Refresh} from "@element-plus/icons-vue";
import {API} from "@/assets/config/API.ts";
const statisticsData = ref<any>({}) const statisticsData = ref<any>({})
const inventoryNumber = ref(false) const inventoryNumber = ref(false)
@ -279,7 +280,7 @@ const searchGoods = () => {
} }
} }
}) })
post("goods/goods/searchDetail", {query: data}).then((res: any) => { post(API.Goods.Base.DetailWithSearch, {query: data}).then((res: any) => {
tableData.value = res.list tableData.value = res.list
total.value = res.total_count total.value = res.total_count
}) })
@ -309,7 +310,7 @@ let init = () => {
pageNum: pageNum.value,// pageNum: pageNum.value,//
pageSize: pageSize.value,// pageSize: pageSize.value,//
} }
post("goods/goods/searchDetail", {query: query}).then((res: any) => { post(API.Goods.Base.DetailWithSearch, {query: query}).then((res: any) => {
tableData.value = res.list tableData.value = res.list
total.value = res.total_count total.value = res.total_count
}) })
@ -339,7 +340,7 @@ interface CateOption {
const allCateList = ref<CateOption[]>([]); const allCateList = ref<CateOption[]>([]);
const getAllCate = () => { const getAllCate = () => {
post("goods/cate/getAllList", null).then((res: any) => { post(API.Goods.Cate.GetAllList, null).then((res: any) => {
const options = []; const options = [];
for (const key in res) { for (const key in res) {
@ -412,7 +413,7 @@ const resetSearch = () => {
* 获取商品统计数据 总成本 总售价 甲乙丙类 * 获取商品统计数据 总成本 总售价 甲乙丙类
*/ */
const getStatisticsData = () => { const getStatisticsData = () => {
post("statistics/goodsStatistics").then((res: any) => { post(API.Statistics.GoodsStatistics).then((res: any) => {
statisticsData.value = res statisticsData.value = res
}) })
} }

View File

@ -138,6 +138,7 @@ import EditOrder from "@/components/inventory/purchase/EditOrder.vue";
import {Plus, Refresh, Search, SemiSelect} from "@element-plus/icons-vue"; import {Plus, Refresh, Search, SemiSelect} from "@element-plus/icons-vue";
import {formatDateArray, getEndOfDay} from "@/utils/dateUtils.ts"; import {formatDateArray, getEndOfDay} from "@/utils/dateUtils.ts";
import UpLoad from "@/components/inventory/purchase/Upload.vue"; import UpLoad from "@/components/inventory/purchase/Upload.vue";
import {API} from "@/assets/config/API.ts";
let tableData = ref([]) let tableData = ref([])
let is_edit = ref(false) let is_edit = ref(false)
@ -168,7 +169,7 @@ let init = () => {
pageSize: 20, pageSize: 20,
...searchModel.value ...searchModel.value
} }
post("inventory/order/list", {query: query}).then((res: any) => { post(API.Inventory.Order.List, {query: query}).then((res: any) => {
tableData.value = res.list tableData.value = res.list
total.value = res.total_count total.value = res.total_count
}) })
@ -210,13 +211,13 @@ const getSupplierList = () => {
const query = { const query = {
turn: 1 turn: 1
} }
post("inventory/supplier/list", {query: query}).then((res: any) => { post(API.Inventory.Supplier.List, {query: query}).then((res: any) => {
supplier_list.value = res.list supplier_list.value = res.list
}) })
} }
const managerUserList: any = ref([]) const managerUserList: any = ref([])
const getManagerUserList = () => { const getManagerUserList = () => {
post("manager/user/list", {}).then((res: any) => { post(API.Common.ManagerUser.List, {}).then((res: any) => {
managerUserList.value = res managerUserList.value = res
}) })
} }

View File

@ -67,6 +67,7 @@ import {nextTick, onMounted, ref, watch} from "vue";
import {post} from "@/utils/request.ts"; import {post} from "@/utils/request.ts";
import AddSupplier from "@/components/inventory/supplier/AddSupplier.vue"; import AddSupplier from "@/components/inventory/supplier/AddSupplier.vue";
import {Search} from "@element-plus/icons-vue"; import {Search} from "@element-plus/icons-vue";
import {API} from "@/assets/config/API.ts";
const tableData = ref<any>([]) const tableData = ref<any>([])
const getSupplier = () => { const getSupplier = () => {
@ -75,7 +76,7 @@ const getSupplier = () => {
pageSize: 20, pageSize: 20,
...searchModel.value, ...searchModel.value,
} }
post("inventory/supplier/list", {query: query}, null).then( post(API.Inventory.Supplier.List, {query: query}, null).then(
(res: any) => { (res: any) => {
tableData.value = res.list tableData.value = res.list
total.value = res.total_count total.value = res.total_count