From c2c4c4ea0962d01cb9f4173216b8fcf17b28f2a3 Mon Sep 17 00:00:00 2001 From: wj <1285151836@qq.com> Date: Thu, 16 Nov 2023 16:48:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 28 ++++- src/main.js | 32 ++++- src/utils/enums.js | 19 +++ src/utils/request.js | 4 +- src/views/components/actionSelect/index.js | 52 ++++++++ src/views/components/actionSelect/index.vue | 16 +++ src/views/components/deptSelect/index.js | 34 ++++++ src/views/components/deptSelect/index.vue | 9 ++ src/views/components/invSelect/invSelect.js | 48 ++++++++ src/views/components/invSelect/invSelect.vue | 16 +++ .../components/mainActionSelect/index.js | 28 +++++ .../components/mainActionSelect/index.vue | 11 ++ src/views/components/thirdSysSelect/index.js | 34 ++++++ src/views/components/thirdSysSelect/index.vue | 9 ++ src/views/index.vue | 22 +++- src/views/system/msg/sysMsgTodo.js | 68 +++++++++++ src/views/system/msg/sysMsgTodo.vue | 114 ++++++++++++++++++ 17 files changed, 532 insertions(+), 12 deletions(-) create mode 100644 src/utils/enums.js create mode 100644 src/views/components/actionSelect/index.js create mode 100644 src/views/components/actionSelect/index.vue create mode 100644 src/views/components/deptSelect/index.js create mode 100644 src/views/components/deptSelect/index.vue create mode 100644 src/views/components/invSelect/invSelect.js create mode 100644 src/views/components/invSelect/invSelect.vue create mode 100644 src/views/components/mainActionSelect/index.js create mode 100644 src/views/components/mainActionSelect/index.vue create mode 100644 src/views/components/thirdSysSelect/index.js create mode 100644 src/views/components/thirdSysSelect/index.vue create mode 100644 src/views/system/msg/sysMsgTodo.js create mode 100644 src/views/system/msg/sysMsgTodo.vue diff --git a/src/App.vue b/src/App.vue index b96c037..2961574 100644 --- a/src/App.vue +++ b/src/App.vue @@ -18,7 +18,7 @@ export default { } } - - + diff --git a/src/main.js b/src/main.js index ee0fcf8..e0ac8ac 100644 --- a/src/main.js +++ b/src/main.js @@ -56,6 +56,13 @@ Vue.prototype.selectDictLabels = selectDictLabels Vue.prototype.download = download Vue.prototype.handleTree = handleTree +//自定义组件 +import invSelect from "@/views/components/invSelect/invSelect.vue"; +import mainActionSelect from "@/views/components/mainActionSelect/index.vue"; +import thirdSysSelect from "@/views/components/thirdSysSelect/index.vue"; +import actionSelect from "@/views/components/actionSelect/index.vue"; +import deptSelect from "@/views/components/deptSelect/index.vue"; + // 全局组件挂载 Vue.component('DictTag', DictTag) Vue.component('Pagination', Pagination) @@ -65,6 +72,11 @@ Vue.component('FileUpload', FileUpload) Vue.component('ImageUpload', ImageUpload) Vue.component('ImagePreview', ImagePreview) Vue.component("cusEditor", cusEditor) +Vue.component("invSelect", invSelect) +Vue.component("mainActionSelect", mainActionSelect) +Vue.component("thirdSysSelect", thirdSysSelect) +Vue.component("actionSelect", actionSelect) +Vue.component("deptSelect", deptSelect) Vue.use(directive) Vue.use(plugins) @@ -82,7 +94,25 @@ DictData.install() */ // 修改 el-dialog 默认点击遮照为不关闭 -Element.Dialog.props.closeOnClickModal.default = false +Element.Dialog.props.closeOnClickModal = {type: Boolean, default: false} +Element.Dialog.props.appendToBody = {type: Boolean, default: true} + +Element.Table.props.border = {type: Boolean, default: true} +Element.Table.props.minHeight = {type: String | Number, default: "250"} +Element.Table.props.fit = {type: Boolean, default: true} +Element.TableColumn.props.showOverflowTooltip = {type: Boolean, default: true} +Element.DatePicker.props.firstDayOfWeek = {type: Number, default: 1} + +Element.Select.methods.deleteSelected = + function deleteSelected(event) { + event.stopPropagation(); + // 改动在这,原始的是这样 var value = this.multiple ? [] : ''; + var value = this.multiple ? [] : null; + this.$emit("input", value); + this.emitChange(value); + this.visible = false; + this.$emit("clear"); + }; Vue.use(Element, { size: Cookies.get('size') || 'mini' // set element-ui default size diff --git a/src/utils/enums.js b/src/utils/enums.js new file mode 100644 index 0000000..f340d85 --- /dev/null +++ b/src/utils/enums.js @@ -0,0 +1,19 @@ +export const msgType = { + PUT_IN_APPLY: {key: "PUT_IN_APPLY", value: 1, desc: "入院物资申请"}, + ORDER_AUDIT: {key: "ORDER_AUDIT", value: 2, desc: "单据审核"}, + INVOICE_CONFIRM: {key: "INVOICE_CONFIRM", value: 3, desc: "单据发票确认"}, + CERT_AUDIT: {key: "CERT_AUDIT", value: 5, desc: "资质审核"}, + USE_AUDIT: {key: "USE_AUDIT", value: 6, desc: "领用单审核"}, + BUY_APPLY_AUDIT: {key: "USE_AUDIT", value: 7, desc: "申购单审核"}, + PROCUREMENT_AUDIT: {key: "USE_AUDIT", value: 8, desc: "采购单审核"}, +} + +export const pushStatus = { + NOT_PUSHED: {key: "NOT_PUSHED", value: 1, desc: "未推送"}, + PUSH_SUCCESS: {key: "PUSH_SUCCESS", value: 2, desc: "推送成功"}, + PUSH_FAIL: {key: "PUSH_FAIL", value: 3, desc: "推送失败"}, +} +export const dealStatus = { + NOT_CONFIRMED: {key: "NOT_CONFIRMED", value: 1, desc: "未处理"}, + CONFIRMED: {key: "CONFIRMED", value: 2, desc: "已处理"}, +} diff --git a/src/utils/request.js b/src/utils/request.js index 36ce51b..47fb469 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -60,7 +60,7 @@ service.interceptors.request.use(config => { const s_url = sessionObj.url; // 请求地址 const s_data = sessionObj.data; // 请求数据 const s_time = sessionObj.time; // 请求时间 - const interval = 1000; // 间隔时间(ms)，小于此时间视为重复提交 + const interval = 300; // 间隔时间(ms)，小于此时间视为重复提交 if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) { const message = '数据正在处理，请勿重复提交'; console.warn(`[${s_url}]: ` + message) @@ -98,7 +98,7 @@ service.interceptors.response.use(res => { isRelogin.show = false; store.dispatch('LogOut').then(() => { Cookies.remove() - location.href = process.env.VUE_APP_CONTEXT_PATH; + location.href = process.env.VUE_APP_CONTEXT_PATH; }) }).catch(() => { isRelogin.show = false; diff --git a/src/views/components/actionSelect/index.js b/src/views/components/actionSelect/index.js new file mode 100644 index 0000000..e63a575 --- /dev/null +++ b/src/views/components/actionSelect/index.js @@ -0,0 +1,52 @@ +import {getLocalJoinByUser} from "@/api/basic/busType"; + + +export default { + name: "actionSelect", + props: {value:"",invCode:{required:true},mainAction:null}, + data() { + return { + val: '', + list:[], + } + }, + watch: { + mainAction(){ + this.val = null + this.getList() + }, + invCode(){ + this.val = null + this.getList() + }, + val(newVal) { + this.$emit('update:value', newVal); + }, + value(newVal) { + this.val = newVal + }, + }, + created() { + this.val=this.value + this.getList() + }, + methods: { + getList(){ + if(!this.invCode){ + return + } + let query = { + code: this.invCode, + enable: true, + mainAction: this.mainAction, + vueType: "supInvoice", + }; + getLocalJoinByUser(query) + .then((response) => { + this.list = response.data.list || []; + }) + .catch(() => { + }); + } + } +} diff --git a/src/views/components/actionSelect/index.vue b/src/views/components/actionSelect/index.vue new file mode 100644 index 0000000..9e3e03f --- /dev/null +++ b/src/views/components/actionSelect/index.vue @@ -0,0 +1,16 @@ + + + diff --git a/src/views/components/deptSelect/index.js b/src/views/components/deptSelect/index.js new file mode 100644 index 0000000..25458d2 --- /dev/null +++ b/src/views/components/deptSelect/index.js @@ -0,0 +1,34 @@ +import {filterList} from "@/api/system/invWarehouse"; + + +export default { + name: "deptSelect", + props: {value:""}, + data() { + return { + val: '', + list:[], + } + }, + watch: { + val(newVal) { + this.$emit('update:value', newVal); + }, + value(newVal) { + this.val = newVal + }, + }, + created() { + this.val=this.value + this.getList() + }, + methods: { + getList(){ + filterList({enable: true}).then(res=>{ + if(res.code==20000){ + this.list = res.data.list||[] + } + }) + } + } +} diff --git a/src/views/components/deptSelect/index.vue b/src/views/components/deptSelect/index.vue new file mode 100644 index 0000000..d0d82b6 --- /dev/null +++ b/src/views/components/deptSelect/index.vue @@ -0,0 +1,9 @@ + + + diff --git a/src/views/components/invSelect/invSelect.js b/src/views/components/invSelect/invSelect.js new file mode 100644 index 0000000..f6e618d --- /dev/null +++ b/src/views/components/invSelect/invSelect.js @@ -0,0 +1,48 @@ +import {getInvListByUser} from "@/api/system/invWarehouse"; + + +export default { + name: "invSelect", + props: {value: {required: true}, deptCode: null}, + data() { + return { + val: '', + list: [], + } + }, + watch: { + deptCode() { + this.val = null + this.getList() + }, + val(newVal) { + this.$emit('update:value', newVal); + }, + value(newVal) { + this.val = newVal + }, + }, + methods: { + invChange() { + this.$emit('update:value', this.val); + // this.changeValue(this.invCode) + }, + getList() { + + let query = { + advanceType: 1, + deptCode: this.deptCode + }; + getInvListByUser(query) + .then((response) => { + this.list = response.data || []; + }) + .catch(() => { + }); + }, + }, + created() { + this.val = this.value + this.getList() + } +} diff --git a/src/views/components/invSelect/invSelect.vue b/src/views/components/invSelect/invSelect.vue new file mode 100644 index 0000000..e999bed --- /dev/null +++ b/src/views/components/invSelect/invSelect.vue @@ -0,0 +1,16 @@ + + + diff --git a/src/views/components/thirdSysSelect/index.js b/src/views/components/thirdSysSelect/index.js new file mode 100644 index 0000000..ba96fcd --- /dev/null +++ b/src/views/components/thirdSysSelect/index.js @@ -0,0 +1,34 @@ +import {getBasicThirdSys} from "@/api/basic/basicThirdSys"; + + +export default { + name: "thirdSysSelect", + props: {value:""}, + data() { + return { + val: '', + list:[], + } + }, + watch: { + val(newVal) { + this.$emit('update:value', newVal); + }, + value(newVal) { + this.val = newVal + }, + }, + created() { + this.val=this.value + this.getList() + }, + methods: { + getList(){ + getBasicThirdSys({enable: true}).then(res=>{ + if(res.code==20000){ + this.list = res.data.list||[] + } + }) + } + } +} diff --git a/src/views/components/thirdSysSelect/index.vue b/src/views/components/thirdSysSelect/index.vue new file mode 100644 index 0000000..e71e7b0 --- /dev/null +++ b/src/views/components/thirdSysSelect/index.vue @@ -0,0 +1,9 @@ + + + diff --git a/src/views/index.vue b/src/views/index.vue index 1a24732..632d373 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -41,7 +41,7 @@ 库存预警 - + {{ invMsgCount }} @@ -62,7 +62,7 @@ 资质预警 - + {{ invMsgCount }} @@ -81,7 +81,7 @@ 重新加载 + @click.stop="linkPage('/system/msg/sysMsgTodo')"> 更多 @@ -111,7 +111,19 @@ width="280"/> + + + 处理 diff --git a/src/views/system/msg/sysMsgTodo.js b/src/views/system/msg/sysMsgTodo.js new file mode 100644 index 0000000..31f6fca --- /dev/null +++ b/src/views/system/msg/sysMsgTodo.js @@ -0,0 +1,68 @@ +import {msgType, pushStatus, dealStatus} from "@/utils/enums"; +import {sysMsgTodoPage} from "@/api/system/sysMsgTodoApi"; + + +let formQuery = { + page: 1, + limit: 10, + msgType: null, + pushStatus: null, + dealStatus: null, + invCode: null, + deptCode: null, +} + +export default { + computed: { + dealStatus() { + return dealStatus + }, + pushStatus() { + return pushStatus + }, + msgType() { + return msgType + }, + }, + data() { + return { + showSearch: true, + loading: false, + list: [], + total: 0, + formQuery: {...formQuery} + } + }, + created() { + this.getList() + }, + methods: { + onSubmit() { + this.formQuery.page = 1 + this.getList() + }, + onReset() { + this.formQuery = {...formQuery} + this.showSearch = true + this.getList() + }, + getList() { + this.loading = true + sysMsgTodoPage(this.formQuery).then(res => { + this.loading = false + if (res.code != 20000) { + this.$message.error(res.message) + return + } + this.list = res.data.list || [] + this.total = res.data.total || 0 + }).catch(e => { + this.loading = false + this.list = [] + this.total = 0 + }) + } + + } + +} diff --git a/src/views/system/msg/sysMsgTodo.vue b/src/views/system/msg/sysMsgTodo.vue new file mode 100644 index 0000000..404dec0 --- /dev/null +++ b/src/views/system/msg/sysMsgTodo.vue @@ -0,0 +1,114 @@ + + +