Compare commits
No commits in common. "25089742d59058b263216e20879f21fa4ddb4d79" and "7874d579d0371132677ed9925f5fdcec616591cb" have entirely different histories.
25089742d5
...
7874d579d0
|
|
@ -1,6 +1,7 @@
|
|||
<template>
|
||||
<div style="position: fixed; z-index: 99999;">
|
||||
<Mask :height="700" :width="900" :is-show="show" @close="show =false">
|
||||
<Mask :height="700" :width="900" :is-show="show">
|
||||
<CloseBtn @click="show = false"></CloseBtn>
|
||||
<el-card>
|
||||
<template #header>
|
||||
<div class="header">追溯码采集</div>
|
||||
|
|
|
|||
|
|
@ -14,19 +14,7 @@
|
|||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="采购人">
|
||||
<el-select
|
||||
v-model="inventory_order_data.managerUserId"
|
||||
placeholder="选择采购人"
|
||||
clearable
|
||||
style="width: 240px"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in managerUserList"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id"
|
||||
/>
|
||||
</el-select>
|
||||
<el-input style="width: 234px;" disabled v-model="userInfo.name"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
|
|
@ -54,7 +42,7 @@
|
|||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item prop="supplierId" label="供应商" :rules="formRules.supplierId">
|
||||
<el-select style="width: 150px;" v-model="inventory_order_data.supplierId" placeholder="请选择供应商">
|
||||
<el-select style="width: 234px;" v-model="inventory_order_data.supplierId" placeholder="请选择供应商">
|
||||
<el-option
|
||||
v-for="item in supplier_list"
|
||||
:key="item.id"
|
||||
|
|
@ -62,7 +50,6 @@
|
|||
:value="item.id"
|
||||
/>
|
||||
</el-select>
|
||||
<el-button type="primary" @click="addSupplier">添加供应商</el-button>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
|
|
@ -176,11 +163,10 @@
|
|||
</div>
|
||||
</template>
|
||||
</Mask>
|
||||
<AddSupplier ref="addSupplierRef" @close="getSupplierList"></AddSupplier>
|
||||
<!-- <Mask :is-show="is_add" :top="100">-->
|
||||
<!-- <Edit ref="editRef" @close="is_add = false;"/>-->
|
||||
<!-- </Mask>-->
|
||||
<CheckoutDetail ref="checkoutDetailRef" @confirm="confirmTrace"></CheckoutDetail>
|
||||
<CheckoutDetail ref="checkoutDetailRef" @confirm="confirmTrace"></CheckoutDetail>
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
|
|
@ -189,7 +175,6 @@ import {post} from '@/utils/request.ts'
|
|||
import Edit from "@/components/inventory/goods/Edit.vue";
|
||||
import Mask from "@/components/common/Mask.vue";
|
||||
import {ElMessage} from "element-plus";
|
||||
import AddSupplier from "@/components/inventory/supplier/AddSupplier.vue";
|
||||
import GoodsSearch from "@/components/inventory/GoodsSearch.vue";
|
||||
import CheckoutDetail from "@/components/inventory/CheckoutDetail.vue";
|
||||
import {Search} from "@element-plus/icons-vue";
|
||||
|
|
@ -210,8 +195,8 @@ let inventory_order_data = ref({
|
|||
managerUserId: null,
|
||||
kindConut: 0,
|
||||
totalPrice: 0,
|
||||
shippingCode: "-",
|
||||
invoiceCode: "-",
|
||||
shippingCode: null,
|
||||
invoiceCode: null,
|
||||
inventoryOrderGoodsList: []
|
||||
})
|
||||
const checkProductionDate = (row: any) => {
|
||||
|
|
@ -260,11 +245,6 @@ const getTotalPrice = () => {
|
|||
const emit = defineEmits(['close'])
|
||||
let exit = () => {
|
||||
isShow.value = false
|
||||
initInventoryOrderData()
|
||||
table_list.value = []
|
||||
emit('close')
|
||||
}
|
||||
const initInventoryOrderData = () => {
|
||||
inventory_order_data.value = {
|
||||
code: null,
|
||||
purchaseDate: getFormattedDate(),
|
||||
|
|
@ -274,10 +254,12 @@ const initInventoryOrderData = () => {
|
|||
managerUserId: null,
|
||||
kindConut: 0,
|
||||
totalPrice: 0,
|
||||
shippingCode: "-",
|
||||
invoiceCode: "-",
|
||||
shippingCode: null,
|
||||
invoiceCode: null,
|
||||
inventoryOrderGoodsList: []
|
||||
}
|
||||
table_list.value = []
|
||||
emit('close')
|
||||
}
|
||||
const table_list: any = ref([])
|
||||
|
||||
|
|
@ -299,6 +281,7 @@ let confirm = async () => {
|
|||
|
||||
// 验证通过后执行原有逻辑
|
||||
inventory_order_data.value.kindConut = table_list.value.length;
|
||||
inventory_order_data.value.managerUserId = userInfo.value.id;
|
||||
|
||||
// 添加药品列表验证
|
||||
if (table_list.value.length === 0) {
|
||||
|
|
@ -372,7 +355,6 @@ const userInfo = ref<any>({})
|
|||
const getUserInfo = () => {
|
||||
post("manager/user/verify", null).then((res: any) => {
|
||||
userInfo.value = res
|
||||
inventory_order_data.value.managerUserId = res.id
|
||||
})
|
||||
}
|
||||
const removeTableRow = (row: any) => {
|
||||
|
|
@ -385,17 +367,7 @@ const removeTableRow = (row: any) => {
|
|||
const init = () => {
|
||||
isShow.value = true
|
||||
getSupplierList()
|
||||
getManagerUserList()
|
||||
|
||||
getUserInfo()
|
||||
|
||||
}
|
||||
const managerUserList: any = ref([])
|
||||
const getManagerUserList = () => {
|
||||
post("manager/user/list", {
|
||||
}).then((res: any) => {
|
||||
managerUserList.value = res
|
||||
})
|
||||
}
|
||||
// 追溯码代码
|
||||
const openCheckoutDetail = (row: any) => {
|
||||
|
|
@ -417,12 +389,6 @@ const confirmTrace = (data: any) => {
|
|||
// }
|
||||
// })
|
||||
}
|
||||
const addSupplierRef = ref()
|
||||
const addSupplier = () => {
|
||||
nextTick(() => {
|
||||
addSupplierRef.value?.addInit();
|
||||
})
|
||||
}
|
||||
defineExpose({init})
|
||||
</script>
|
||||
<style scoped lang="scss">
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<template>
|
||||
<Mask :width="1200" :is-show="isShow" @close="exit"
|
||||
<Mask :width="1200" :is-show="isShow" @close="exit"
|
||||
title="编辑" :height="720" :show-footer="true">
|
||||
<div class="edit-panel" v-loading="isLoading" element-loading-text="正在保存......">
|
||||
<div class="top">
|
||||
|
|
@ -14,21 +14,7 @@
|
|||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="采购人">
|
||||
<el-select
|
||||
v-if="orderInfoIsEdit"
|
||||
v-model="inventory_order_data.managerUserId"
|
||||
placeholder="选择采购人"
|
||||
clearable
|
||||
style="width: 240px"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in managerUserList"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id"
|
||||
/>
|
||||
</el-select>
|
||||
<span style="width: 234px;" class="order-info" v-else>{{ inventory_order_data.managerUserName }}</span>
|
||||
<span style="width: 234px;" class="order-info">{{ inventory_order_data.managerUserName }}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
|
|
@ -206,8 +192,8 @@
|
|||
</template>
|
||||
</Mask>
|
||||
|
||||
<AddSupplier ref="addSupplierRef" @close="getSupplierList"></AddSupplier>
|
||||
<Mask :is-show="is_add">
|
||||
|
||||
<Mask :is-show="is_add" >
|
||||
<Edit ref="editRef" @close="is_add = false;"/>
|
||||
</Mask>
|
||||
|
||||
|
|
@ -221,7 +207,6 @@ import Mask from "@/components/common/Mask.vue";
|
|||
import {ElMessage, ElMessageBox} from "element-plus";
|
||||
import GoodsSearch from "@/components/inventory/GoodsSearch.vue";
|
||||
import CloseBtn from "@/components/CloseBtn.vue";
|
||||
import AddSupplier from "@/components/inventory/supplier/AddSupplier.vue";
|
||||
|
||||
const props = defineProps({
|
||||
code: {
|
||||
|
|
@ -318,9 +303,7 @@ const init = (e: any) => {
|
|||
code.value = e
|
||||
isShow.value = true
|
||||
getSupplierList()
|
||||
getManagerUserList()
|
||||
getOrderDetail()
|
||||
|
||||
}
|
||||
const getTotalPrice = () => {
|
||||
let totalPrice = 0;
|
||||
|
|
@ -379,13 +362,6 @@ const addOneGoods = (row: any) => {
|
|||
}
|
||||
)
|
||||
}
|
||||
const managerUserList: any = ref([])
|
||||
const getManagerUserList = () => {
|
||||
post("manager/user/list", {}).then((res: any) => {
|
||||
managerUserList.value = res
|
||||
})
|
||||
}
|
||||
|
||||
const checkValue = (data: any) => {
|
||||
let msg = null;
|
||||
if (data.wholeNumber == 0) {
|
||||
|
|
@ -421,13 +397,7 @@ const goodsSelectCallBack = (inventory: any) => {
|
|||
getTotalPrice()
|
||||
}, 200)
|
||||
}
|
||||
const addSupplierRef = ref();
|
||||
const addSupplier = () => {
|
||||
nextTick(() => {
|
||||
addSupplierRef.value?.addInit()
|
||||
})
|
||||
|
||||
}
|
||||
defineExpose({init})
|
||||
</script>
|
||||
<style scoped lang="scss">
|
||||
|
|
@ -469,7 +439,6 @@ defineExpose({init})
|
|||
.active {
|
||||
background-color: red;
|
||||
}
|
||||
|
||||
.edit-panel {
|
||||
height: 562px;
|
||||
padding: 24px 24px 0;
|
||||
|
|
@ -502,7 +471,6 @@ defineExpose({init})
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
.bottom {
|
||||
height: 86px;
|
||||
display: flex;
|
||||
|
|
|
|||
|
|
@ -61,11 +61,6 @@ const reciceMessage = (response: Response) => {
|
|||
}
|
||||
const errorCallback = () => {
|
||||
emit('changeLoading', false)
|
||||
ElMessage({
|
||||
message: "读卡器连接失败",
|
||||
duration: 1000,
|
||||
type: 'error',
|
||||
});
|
||||
}
|
||||
|
||||
const emit = defineEmits(['socialCardUpdate', 'close', 'changeLoading'])
|
||||
|
|
@ -87,6 +82,14 @@ const getInfoFor1101 = (params: any) => {
|
|||
duration: 1000,
|
||||
});
|
||||
emit('socialCardUpdate', socialCard.value)
|
||||
}).catch((err:any) => {
|
||||
isReading.value = false;
|
||||
emit('changeLoading', false)
|
||||
ElMessage({
|
||||
message: "读取失败",
|
||||
duration: 1000,
|
||||
type: 'error',
|
||||
});
|
||||
})
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,23 +1,9 @@
|
|||
<template>
|
||||
<div class="container-wrapper">
|
||||
<div class="top">
|
||||
<div class="search">
|
||||
<el-date-picker
|
||||
v-model="selectedDate"
|
||||
type="daterange"
|
||||
range-separator="-"
|
||||
@change="handleDateChange"
|
||||
start-placeholder="开始时间"
|
||||
end-placeholder="结束时间"
|
||||
/>
|
||||
|
||||
</div>
|
||||
<div class="other-btn">
|
||||
<el-dropdown>
|
||||
<el-button type="primary" :icon="Plus" @click="openAdd">新增采购</el-button>
|
||||
</el-dropdown>
|
||||
</div>
|
||||
|
||||
<el-dropdown>
|
||||
<el-button type="primary" :icon="Plus" @click="openAdd">新增采购</el-button>
|
||||
</el-dropdown>
|
||||
</div>
|
||||
<div class="content_list">
|
||||
<el-scrollbar>
|
||||
|
|
@ -30,7 +16,7 @@
|
|||
<el-table-column label="品种" prop="kindCount" width="100">
|
||||
|
||||
</el-table-column>
|
||||
<el-table-column label="入库金额" width="200">
|
||||
<el-table-column label="入库金额" width="100">
|
||||
<template #default="scope">
|
||||
￥{{ scope.row.totalPrice.toFixed(2) }}
|
||||
</template>
|
||||
|
|
@ -75,7 +61,6 @@ import AddOrder from "@/components/inventory/purchase/AddOrder.vue";
|
|||
import Mask from "@/components/common/Mask.vue";
|
||||
import EditOrder from "@/components/inventory/purchase/EditOrder.vue";
|
||||
import {Plus} from "@element-plus/icons-vue";
|
||||
import {formatDateArray, getEndOfDay} from "@/utils/dateUtils.ts";
|
||||
|
||||
let tableData = ref([])
|
||||
let is_edit = ref(false)
|
||||
|
|
@ -130,15 +115,6 @@ const formatDate = (isoStr: any) => {
|
|||
const date = new Date(isoStr);
|
||||
return `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}`;
|
||||
}
|
||||
|
||||
const selectedDate = ref<any>([])
|
||||
const handleDateChange = (date: any[]) => {
|
||||
selectedDate.value = formatDateArray(date)
|
||||
if (selectedDate.value[0] == selectedDate.value[1]) {
|
||||
selectedDate.value[1] = getEndOfDay(selectedDate.value[1]); // 输出今天 23:59
|
||||
}
|
||||
}
|
||||
|
||||
</script>
|
||||
<style scoped lang="scss">
|
||||
@use "@/assets/scss/base.scss";
|
||||
|
|
|
|||
Loading…
Reference in New Issue