diff --git a/src/assets/scss/main.scss b/src/assets/scss/main.scss
index 8c6e5a3..34453e2 100644
--- a/src/assets/scss/main.scss
+++ b/src/assets/scss/main.scss
@@ -131,7 +131,7 @@ body {
border-radius: 8px 8px 0 0;
}
$btn-color: #4D6DE4;
-$lighter-color: #7c91e3;
+$lighter-color: rgba(#4D6DE4, 0.5);
.default-btn{
cursor: pointer;
width: 120px;
diff --git a/src/components/inventory/Upload.vue b/src/components/inventory/Upload.vue
new file mode 100644
index 0000000..7360d92
--- /dev/null
+++ b/src/components/inventory/Upload.vue
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/inventory/goods/Cate.vue b/src/components/inventory/goods/Cate.vue
index e5883ef..0e862a8 100644
--- a/src/components/inventory/goods/Cate.vue
+++ b/src/components/inventory/goods/Cate.vue
@@ -1,5 +1,5 @@
-
+
-
+
-
-
+
@@ -148,11 +156,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -173,8 +181,8 @@
style="color: #FF282E">{{ inventory_order_data.totalPrice.toFixed(2) }}
@@ -296,7 +304,7 @@ function getFormattedDate() {
}
let confirm = async () => {
- console.log('table_list.value++++++++++++++',table_list.value)
+ console.log('table_list.value++++++++++++++', table_list.value)
// 进行表单验证
try {
await orderForm.value.validate()
@@ -327,7 +335,7 @@ let confirm = async () => {
}
table_list.value.forEach((item: any) => {
console.log(item.traceabilityCodeList)
- item.traceabilityCode= JSON.stringify(item.traceabilityCodeList)
+ item.traceabilityCode = JSON.stringify(item.traceabilityCodeList)
})
let data = {
inventoryOrder: JSON.parse(JSON.stringify(inventory_order_data.value)),
@@ -400,8 +408,7 @@ const init = () => {
}
const managerUserList: any = ref([])
const getManagerUserList = () => {
- post("manager/user/list", {
- }).then((res: any) => {
+ post("manager/user/list", {}).then((res: any) => {
managerUserList.value = res
})
}
@@ -516,6 +523,9 @@ defineExpose({init})
font-size: 22px;
color: #333333;
font-style: normal;
+ .btn{
+ display: flex;
+ }
}
.error {
diff --git a/src/views/inventory/goods.vue b/src/views/inventory/goods.vue
index 54920d5..6ae4fd6 100644
--- a/src/views/inventory/goods.vue
+++ b/src/views/inventory/goods.vue
@@ -19,7 +19,7 @@
-
@@ -426,6 +426,7 @@ const getStatisticsData = () => {
statisticsData.value = res
})
}
+const props = { multiple: true }