From 29cce41ccc514657a449a655887b1f9c94073bfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=AE=9C=E9=98=B3?= <1301318913@qq.com>
Date: Wed, 27 Mar 2024 17:56:23 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=9C?=
=?UTF-8?q?=E6=97=A5=E5=8E=86=E6=A0=B7=E5=BC=8F=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/mes/jobcalendar/index.vue | 10 ++++++++++
1 file changed, 10 insertions(+)
create mode 100644 src/views/mes/jobcalendar/index.vue
diff --git a/src/views/mes/jobcalendar/index.vue b/src/views/mes/jobcalendar/index.vue
new file mode 100644
index 000000000..ac7716f24
--- /dev/null
+++ b/src/views/mes/jobcalendar/index.vue
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
\ No newline at end of file
From 37fb23d643132b00acc2d756491a9343c782193f Mon Sep 17 00:00:00 2001
From: chenfang
Date: Wed, 27 Mar 2024 18:54:23 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=AB=99=E5=86=85=E4=BF=A1=20=E8=A7=92?=
=?UTF-8?q?=E8=89=B2=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/system/notify/template/index.ts | 1 +
.../system/notify/template/NotifyTemplateForm.vue | 12 ++++++++++++
2 files changed, 13 insertions(+)
diff --git a/src/api/system/notify/template/index.ts b/src/api/system/notify/template/index.ts
index cd0e12238..b7ce8a2f3 100644
--- a/src/api/system/notify/template/index.ts
+++ b/src/api/system/notify/template/index.ts
@@ -5,6 +5,7 @@ export interface NotifyTemplateVO {
name: string
nickname: string
code: string
+ roleIds: []
content: string
type: number
params: string
diff --git a/src/views/system/notify/template/NotifyTemplateForm.vue b/src/views/system/notify/template/NotifyTemplateForm.vue
index 919c6549f..30399a481 100644
--- a/src/views/system/notify/template/NotifyTemplateForm.vue
+++ b/src/views/system/notify/template/NotifyTemplateForm.vue
@@ -16,6 +16,11 @@
+
+
+
+ />
+
@@ -54,12 +59,15 @@
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import * as NotifyTemplateApi from '@/api/system/notify/template'
import { CommonStatusEnum } from '@/utils/constants'
+import * as RoleApi from '@/api/system/role'
const message = useMessage() // 消息弹窗
const dialogVisible = ref(false) // 弹窗的是否展示
const dialogTitle = ref('') // 弹窗的标题
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
const formType = ref('') // 表单的类型
+const roleList = ref([]) // 角色的列表
+
const formData = ref({
id: null,
name: '',
@@ -67,6 +75,7 @@ const formData = ref({
code: '',
content: '',
type: null,
+ roleIds: [],
params: '',
status: CommonStatusEnum.ENABLE,
remark: ''
@@ -76,6 +85,7 @@ const formRules = reactive({
status: [{ required: true, message: '开启状态不能为空', trigger: 'blur' }],
code: [{ required: true, message: '模板编码不能为空', trigger: 'blur' }],
name: [{ required: true, message: '模板名称不能为空', trigger: 'blur' }],
+ roleIds: [{ required: true, message: '角色不能为空', trigger: 'blur' }],
nickname: [{ required: true, message: '发件人姓名不能为空', trigger: 'blur' }],
content: [{ required: true, message: '模板内容不能为空', trigger: 'blur' }]
})
@@ -96,6 +106,8 @@ const open = async (type: string, id?: number) => {
formLoading.value = false
}
}
+ // 获得角色列表
+ roleList.value = await RoleApi.getSimpleRoleList()
}
defineExpose({ open }) // 提供 open 方法，用于打开弹窗
From 04b5d9d94fae41b690074d44f5cd748e4e59af77 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Thu, 28 Mar 2024 07:42:18 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../wms/supplierinvoiceRequestMain/index.ts | 1 +
src/utils/dict.ts | 1 +
.../supplierinvoiceRequestMain/index.vue | 60 ++-
.../supplierinvoiceRequestMain.data.ts | 341 ++++++++++++------
4 files changed, 281 insertions(+), 122 deletions(-)
diff --git a/src/api/wms/supplierinvoiceRequestMain/index.ts b/src/api/wms/supplierinvoiceRequestMain/index.ts
index c0bd6ec7a..b3e752a7b 100644
--- a/src/api/wms/supplierinvoiceRequestMain/index.ts
+++ b/src/api/wms/supplierinvoiceRequestMain/index.ts
@@ -88,3 +88,4 @@ export const exportSupplierinvoiceRequestMain = async (params) => {
return await request.download({ url: `/wms/supplierinvoice-request-main/export-excel`, params })
}
}
+
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index c2a9ff9f1..e40305070 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -278,4 +278,5 @@ export enum DICT_TYPE {
PURCHASERECEIPT_SOURCE_TYPE="purchasereceipt_source_type",//采购收货数据来源
PLAN_PRODUCTION_TYPE = "plan_production_type", // 生产计划类型
DELIVER_TYPE="deliver_type",//发货类型
+ BILL_TYPE="bill_type", // 发票类型
}
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 62d683655..7d81aadaa 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -1,14 +1,18 @@
-
+
-
+
@@ -28,28 +32,48 @@
-
+
-
+ :apiDelete="SupplierinvoiceRequestDetailApi.deleteSupplierinvoiceRequestDetail"
+ :Echo="Echo"
+ />
+