list) {
list.forEach(o -> o.setParentId(parentId));
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/resources/fonts/SimSun.ttf b/hangtag-module-oms/hangtag-module-oms-biz/src/main/resources/fonts/SimSun.ttf
new file mode 100644
index 0000000..e0115ab
Binary files /dev/null and b/hangtag-module-oms/hangtag-module-oms-biz/src/main/resources/fonts/SimSun.ttf differ
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/resources/templates/pdf_template.html b/hangtag-module-oms/hangtag-module-oms-biz/src/main/resources/templates/pdf_template.html
new file mode 100644
index 0000000..4fd5faf
--- /dev/null
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/resources/templates/pdf_template.html
@@ -0,0 +1,37 @@
+
+
+
+
+ PDF文档
+
+
+
+PDF文档标题
+这是PDF文档的内容部分,由Thymeleaf模板引擎渲染。
+
+
+
\ No newline at end of file
diff --git a/hangtag-server/src/main/resources/application.yaml b/hangtag-server/src/main/resources/application.yaml
index 106ba6f..e6ddef5 100644
--- a/hangtag-server/src/main/resources/application.yaml
+++ b/hangtag-server/src/main/resources/application.yaml
@@ -40,6 +40,12 @@ spring:
redis:
time-to-live: 1h # 设置过期时间为 1 小时
+ thymeleaf:
+ prefix: classpath:/templates/
+ suffix: .html
+ mode: HTML
+ encoding: UTF-8
+ cache: false
--- #################### 接口文档配置 ####################
springdoc:
diff --git a/hangtag-ui/hangtag-ui-admin/src/api/oms/saleorder/index.ts b/hangtag-ui/hangtag-ui-admin/src/api/oms/saleorder/index.ts
index 0bdaad5..2ca4d49 100644
--- a/hangtag-ui/hangtag-ui-admin/src/api/oms/saleorder/index.ts
+++ b/hangtag-ui/hangtag-ui-admin/src/api/oms/saleorder/index.ts
@@ -81,4 +81,14 @@ export const SaleOrderApi = {
})
},
+ // 驳回
+ rejectOrder: async (data) => {
+ return await request.post({
+ url: `/oms/sale-order/rejectOrder`,
+ data: data
+ })
+ },
+
+
+
}
diff --git a/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/index.vue b/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/index.vue
index 9b37c7a..13f5201 100644
--- a/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/index.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/index.vue
@@ -118,6 +118,7 @@
item.id))"
:disabled="selectionList.length === 0"
>驳回
@@ -267,17 +268,17 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -340,7 +341,7 @@ const exportLoading = ref(false) // 导出的加载中
//驳回参数
const rejectOpen = ref(false)
-const rejectTitle = ref()
+const rejectTitle = ref('')
const rejectform = reactive({
rejectReason: undefined
})
@@ -400,29 +401,12 @@ const handleDelete = async (id: number) => {
}
-/** 反审核按钮操作 */
-// const handleReject = async () => {
-// try {
-// let ids = selectionList;
-// /*let auditStatuss = row.ifaudit || this.auditStatuss;
-//
-// for(var vals of auditStatuss) {
-// if(vals!='0'){
-// message.error("请选择待审核数据");
-// return;
-// }
-// }*/
-//
-// rejectform = {
-// rejectReason: null
-// };
-// this.resetForm("rejectform");
-// this.rejectTitle = "是否驳回选中的数据项?";
-// this.rejectOpen = true;
-// } catch {}
-// },
-
-
+/** 驳回操作 */
+const handleReject = async (ids: number[]) => {
+ rejectform.rejectReason = undefined
+ rejectTitle.value = "是否驳回选中的数据项?"
+ rejectOpen.value = true
+}
/** 审批/反审批操作 */
const handleUpdateBillStatus = async (ids: number[], operateKey: string) => {
try {
@@ -494,23 +478,29 @@ const handleSelectionChange = (rows: SaleOrderVO[]) => {
/** 驳回提交按钮 */
-/*const submitRejectForm = async () => {
- const ids = selectionList.map((item) => item.id
- if (this.rejectform.rejectReason != null) {
+const submitRejectForm = async () => {
+ const ids = selectionList.value.map((item) => item.id)
+ if(rejectform.rejectReason != null) {
const data = {
ids:ids,
- reason:this.rejectform.rejectReason
+ reason:rejectform.rejectReason
}
- /!* notAuditOrder(data).then(response => {
- this.msgSuccess("驳回成功");
- this.rejectOpen = false;
- this.getList();
- });*!/
-
+ await SaleOrderApi.rejectOrder(data).then(response => {
+ message.success("驳回成功");
+ rejectOpen.value = false;
+ getList();
+ });
}else {
- message.error(`请选择驳回原因!`)
+ message.error(`请填写驳回原因!`)
}
-}*/
+}
+
+
+/** 驳回取消按钮 */
+const rejectCancel = () =>{
+ rejectOpen.value = false
+ rejectform.rejectReason = undefined
+}
/** 激活时 */