diff --git a/src/views/stockIn/NoPoStockIn/index.vue b/src/views/stockIn/NoPoStockIn/index.vue
index 91f97e1..a3f07d3 100644
--- a/src/views/stockIn/NoPoStockIn/index.vue
+++ b/src/views/stockIn/NoPoStockIn/index.vue
@@ -11,6 +11,7 @@
+ 新增到货单
搜索
@@ -91,6 +92,7 @@
+
@@ -110,6 +112,7 @@ import { IFTRUE, areAllNotEmpty, msToDate } from "@/utils/CommonUtil"
import { NoChargeStockIn } from '@/api/StockIn'
import {getOpCode} from "@/api/opcode";
import { bTableHeight } from "../../../composables/calcTableHeight";
+import Drawer from '@/views/stockIn/delivery/drawer.vue'
const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableHeight(220);
const route = useRoute()
@@ -134,6 +137,7 @@ const state = reactive({
button_state: false,
MATERIALRECEIVEACT: [] as any,
ReceiveACTList: [] as any,
+ showDeliveryDrawer: false,
queryParams: {
queryId: "",
version: "",
@@ -165,7 +169,7 @@ const state = reactive({
userList: [] as any,
column: [] as any,
});
-const { ERPFACTORY, MATERIALRECEIVEACT, rsa, queryParams, loading, button_loading, userList, column, operateParams } = toRefs(state);
+const { ERPFACTORY, MATERIALRECEIVEACT, rsa, showDeliveryDrawer, queryParams, loading, button_loading, userList, column, operateParams } = toRefs(state);
onMounted(() =>{
var newDate = new Date();
@@ -209,6 +213,18 @@ function SelectReceiveAct() {
})
}
+// 新增到货单
+function addDeliveryNote() {
+ state.showDeliveryDrawer = true
+}
+
+// 创建到货单后刷新页面
+function refresh(data:any) {
+ state.queryParams.params.RECEIVEREQUESTNAME = data
+ state.showDeliveryDrawer = false
+ handleQuery()
+}
+
// 更新列
function updateList(col: any) {
state.column = col;
diff --git a/src/views/stockIn/StockInByCharge/index.vue b/src/views/stockIn/StockInByCharge/index.vue
index 88848e2..6ca037e 100644
--- a/src/views/stockIn/StockInByCharge/index.vue
+++ b/src/views/stockIn/StockInByCharge/index.vue
@@ -189,7 +189,7 @@
-
+
@@ -216,7 +216,7 @@ import { getOpCode } from '@/api/opcode'
import { printLabel } from '@/api/label'
import { bTableHeight } from '@/composables/calcTableHeight'
import { cals } from '@/utils/cal'
-import Drawer from '@/views/stockIn/StockInByCharge/drawer.vue'
+import Drawer from '@/views/stockIn/delivery/drawer.vue'
const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableHeight(530)
const queryFormRef = ref(ElForm)
diff --git a/src/views/stockIn/StockInByCharge/drawer.vue b/src/views/stockIn/delivery/drawer.vue
similarity index 98%
rename from src/views/stockIn/StockInByCharge/drawer.vue
rename to src/views/stockIn/delivery/drawer.vue
index bd0dbe9..94e2580 100644
--- a/src/views/stockIn/StockInByCharge/drawer.vue
+++ b/src/views/stockIn/delivery/drawer.vue
@@ -108,6 +108,11 @@ import { getORG } from '@/api/auth'
const queryFormRef = ref(ElForm)
const { proxy }: any = getCurrentInstance()
+
+const props = defineProps<{
+ deliveryType: string;
+}>();
+
// 变量
let state = reactive({
dataList: [] as any, // 表格数据
@@ -218,7 +223,7 @@ function handleCreate() {
let name = "DK" + Date.now()
createDelivery({
deliveryName: name,
- deliveryType: '01',
+ deliveryType: props.deliveryType,
siteName: 'SDK',
receiveList: state.receiveList
}).then((res: any) => {