diff --git a/src/api/inventory/invSickTrace.js b/src/api/inventory/invSickTrace.js new file mode 100644 index 0000000..a8390a4 --- /dev/null +++ b/src/api/inventory/invSickTrace.js @@ -0,0 +1,9 @@ +import axios from "@/utils/axios"; + +export function filterSickTrace(query) { + return axios({ + url: "/spms/inv/sick/order/trace", + method: "get", + params: query + }); +} diff --git a/src/views/basic/BussinessType.vue b/src/views/basic/BussinessType.vue index e94364f..4531b6b 100644 --- a/src/views/basic/BussinessType.vue +++ b/src/views/basic/BussinessType.vue @@ -183,7 +183,7 @@ export default { inputQuery: { action: "", name: "", - enable: "", + enable: null, remark: "", mainAction: "", thirdSysFk: "", @@ -295,8 +295,12 @@ export default { this.$message.error("扫码单据类型名称不能为空！"); return; } + if (this.$isBlank(this.inputQuery.corpType)) { + this.$message.error("往来信息类型不能为空！"); + return; + } if (this.inputQuery.enable && this.inputQuery.localAction == "") { - this.$message.error("本地单据不能为空！"); + this.$message.error("本地单据类型不能为空！"); return; } if (this.inputQuery.mainAction == "" || this.inputQuery.mainAction == null) { @@ -321,7 +325,7 @@ export default { onModifySubmit() { if (this.inputQuery.enable && this.inputQuery.localAction == "") { - this.$message.error("本地单据不能为空！"); + this.$message.error("本地单据类型不能为空！"); return; } @@ -367,7 +371,7 @@ export default { handleAddClick() { - this.inputQuery = {enable: true, expireTip: true}; + this.inputQuery = {enable: false, expireTip: true}; this.addDialogVisible = true; }, diff --git a/src/views/basic/BussinessTypeLoclModify.vue b/src/views/basic/BussinessTypeLoclModify.vue index 386beef..9ed4991 100644 --- a/src/views/basic/BussinessTypeLoclModify.vue +++ b/src/views/basic/BussinessTypeLoclModify.vue @@ -113,9 +113,8 @@
- - 缺量自动补单 + 预验收
@@ -124,17 +123,19 @@ 允许供应商使用 +
- 预验收 + + 自动补单
是否全量补单 + :disabled="!inputQuery.changeEnable">全量补单
@@ -162,6 +163,8 @@ + + @@ -220,6 +223,47 @@ + + + + +
+
+ 补单默认仓库:  +
+ + + {{ item.name }} + + +
+ + + +
+
+ 补单默认分库:  +
+ + + {{ item.name }} + + +
+ + +
@@ -274,6 +318,8 @@ import { deleteChangeBusType, updateChangeBusType, removeBusChange } from "../../api/basic/busChangeType"; +import {filterAll} from "@/api/basic/invWarehouse"; +import {filterSubByInv} from "@/api/basic/invSubWarehouse"; export default { name: "inputQuery", @@ -310,6 +356,8 @@ export default { changeList: [], visibleChange: false, loading: false, + storageList: [], + subInvList: [], } }, methods: { @@ -447,6 +495,12 @@ export default { } , + advanceChange() { + if (this.inputQuery.advanceType) { + this.inputQuery.preIn = false; + } + }, + isChangeOrder() { if (this.inputQuery.changeEnable) { @@ -455,9 +509,39 @@ export default { } else { this.visibleChange = false; this.removeBusChangeType(); + this.inputQuery.supplementAll = false; } } , + supplementChange() { + }, + getStorage() { + this.storageList = []; + filterAll() + .then((response) => { + this.storageList = response.data || []; + this.findDefaultSubInv(); + }) + .catch(() => { + }); + }, + findDefaultSubInv() { + this.subInvList = []; + let query = { + pcode: this.editQuery.defaultInv + }; + filterSubByInv(query) + .then((response) => { + this.subInvList = response.data || []; + }) + .catch(() => { + }); + }, + invChange() { + if (this.$isNotBlank(this.inputQuery.defaultSubInv)) + this.inputQuery.defaultSubInv = null; + this.findDefaultSubInv(); + }, }, created() { diff --git a/src/views/basic/BussinessTypeModify.vue b/src/views/basic/BussinessTypeModify.vue index 0d9341a..a96ba89 100644 --- a/src/views/basic/BussinessTypeModify.vue +++ b/src/views/basic/BussinessTypeModify.vue @@ -171,36 +171,36 @@ - -
-
- 补单默认仓库:  -
- - - {{ item.name }} - - - - - {{ item.name }} - - -
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -223,8 +223,7 @@
- 启用单据类型 - + 启用单据类型 允许手动输入客户信息 以使用单元计量出库 @@ -253,11 +252,11 @@
- 单据默认勾选缺量补单 + 单据默认自动补单 - 出入库时必须采集预验收产品 + 出库时必须校验预验收库存 - 出入库时是否查询库存 + 是否允许无库存出库 采集UDI码时进行三期校验 @@ -341,7 +340,7 @@
- 缺量补单 + 自动补单
@@ -418,7 +417,7 @@
- 缺量补单 + 自动补单
diff --git a/src/views/basic/CorpMaintain.vue b/src/views/basic/CorpMaintain.vue index 3ccd07c..bead8e3 100644 --- a/src/views/basic/CorpMaintain.vue +++ b/src/views/basic/CorpMaintain.vue @@ -484,6 +484,12 @@ export default { this.getThirdSysDetail(); }, formSubmit() { + + if (this.$isBlank(this.editQuery.corpType)) { + this.$message.error("往来单位类型不能为空！"); + return; + } + this.$refs["dataForm"].validate(valid => { if (valid) { this.formLoading = true; diff --git a/src/views/basic/CorpRelevance.vue b/src/views/basic/CorpRelevance.vue index e6bb66c..1c9ac2f 100644 --- a/src/views/basic/CorpRelevance.vue +++ b/src/views/basic/CorpRelevance.vue @@ -56,13 +56,6 @@
- - - - - - - +
+ + + + + + + + 查询 + + 国家同步库查询 + + + + + + + + + + + + + +
+
+ 产品标识:  +
+ +
+ + + +
+
+ 最小包装单元内包含使用单元数量:  +
+ +
+ + + + + +
+
+ 包含下级产品编码:  +
+ + +
+ + + +
+
+ 包含最小销售包装数量:  +
+ +
+ + + + + + + + + + +
+
+ 产品名称:  +
+ +
+ + + +
+
+ 规格型号:  +
+ +
+ + + + + +
+
+ 产品类别:  +
+ +
+ + +
+
+ 分类编码:  +
+ +
+ + + + + + + +
+
+ 医疗器械注册人:  +
+ +
+ + +
+
+ 注册人英文名称:  +
+ +
+ + + + + + + +
+
+ 器械类别:  +
+ +
+ + + +
+
+ 生产厂家:  +
+ +
+ + + + + + +
+
+ 商品条码:  +
+ +
+ + +
+
+ 医保编码:  +
+ +
+ + + + + +
+
+ 统一社会信用号:  +
+ +
+ + +
+
+ 注册证/备案号:  +
+ +
+ + + + + +
+
+ 产品描述:  +
+ +
+ + + + + + + + + + +
+
+ 是否包含批号:  +
+ +
+ + +
+
+ 是否包含序列号:  +
+ +
+ + + + +
+
+ 是否包含生产日期:  +
+ +
+ + +
+
+ 是否包含失效日期:  +
+ +
+ + + + + + + + + + + +
+
+ 上级产品编码:  +
+ +
+ + + +
+
+ 包装级别:  +
+ +
+ + + + +
+
+ 计量单位/包装级别:  +
+ + +
+ + + +
+
+ 包含下级包装数量:  +
+ +
+ + + + + + + + + + + +
+ + + + + diff --git a/src/views/basic/UdiInfoSelectLocalUdi.vue b/src/views/basic/UdiInfoSelectLocalUdi.vue index 3252b49..ac426c4 100644 --- a/src/views/basic/UdiInfoSelectLocalUdi.vue +++ b/src/views/basic/UdiInfoSelectLocalUdi.vue @@ -72,6 +72,11 @@ + 查询 - - -
取消 @@ -584,7 +575,9 @@ >
- + { this.loading = false; this.mergeList = response.data.list || []; + this.subList = []; }) .catch(() => { this.loading = false; @@ -1254,7 +1249,7 @@ export default { this.currentCode = row.code; this.currentRow = row; this.curSeleUser = null; - this.busTableTitle = row.name + " 仓库关联单据类型"; + this.busTableTitle = "仓库 " + '"' + row.name + '"' + ": 关联单据类型"; this.loadLinkData(row) }, @@ -1329,6 +1324,7 @@ export default { }, cancelRelBusDiaolog() { this.relBusUserVisile = false; + this.getUserBusTypeList(1); }, getHospitalUser(val) { if (val != null) { @@ -1449,39 +1445,39 @@ export default { } }, addBussinessTypeData() { - if (this.selectBussinessTypeList.length == 0) { - this.$message.error("请选择单据类型") - } else { - this.bussinessTypeFormVisible = false; - let query = { - code: this.currentCode, - bussinessTypes: JSON.stringify(this.selectBussinessTypeList) - }; - saveWarehouseBussinessType(query).then((res) => { - - if (res.code == 20000) { - this.$message.success("修改成功！"); - //重新加载数据表格 - this.busQuery = { - code: this.currentCode, - page: 1, - limit: 10 - } - warehouseBussinessTypeList(this.busQuery).then((res) => { - this.bussinessTypeData = res.data.list; - this.busTotal = res.data.total; - }).catch((error) => { - this.bussinessTypeData = []; - this.busTotal = 0; - }); - } else { - this.$message.error(res.message); + // if (this.selectBussinessTypeList.length == 0) { + // this.$message.error("请选择单据类型") + // } else { + this.bussinessTypeFormVisible = false; + let query = { + code: this.currentCode, + bussinessTypes: JSON.stringify(this.selectBussinessTypeList) + }; + saveWarehouseBussinessType(query).then((res) => { + + if (res.code == 20000) { + this.$message.success("修改成功！"); + //重新加载数据表格 + this.busQuery = { + code: this.currentCode, + page: 1, + limit: 10 } + warehouseBussinessTypeList(this.busQuery).then((res) => { + this.bussinessTypeData = res.data.list; + this.busTotal = res.data.total; + }).catch((error) => { + this.bussinessTypeData = []; + this.busTotal = 0; + }); + } else { + this.$message.error(res.message); + } - }).catch((error) => { - }); - } + }).catch((error) => { + }); + // } }, updateDirector(row) { row.director = !row.director; @@ -1526,6 +1522,12 @@ export default { }, //绑定第三方仓库 bindThrWarehouse() { + + if (this.checkThrWarehouseRow == null) { + this.$message.error("请先选择绑定仓库！"); + return; + } + this.thrWareHouseVisible = false; let params = { id: this.currentId, @@ -1605,6 +1607,7 @@ export default { this.thrWareHouseVisible = true; this.$message.error("第三方仓库数据加载失败"); }); + this.$forceUpdate(); }, intentSubSelect(row) { @@ -1675,7 +1678,7 @@ export default { }); }, loadUserBusType(row) { - this.busTableTitle = row.employeeName + " 用户关联单据类型"; + this.busTableTitle = "用户 " + '"' + row.employeeName + '"' + ": 关联单据类型"; this.curSeleUser = row; this.getUserBusTypeList(1); }, @@ -1690,7 +1693,7 @@ export default { filterUserBusTypeList(queryParam).then((res) => { if (res.code === 20000) { this.bussinessTypeData = res.data.list || []; - this.bussinessTypeTotal = res.data.total || 0; + this.busTotal = res.data.total || 0; } }).catch((error) => { }) diff --git a/src/views/business/stockOrder.vue b/src/views/business/stockOrder.vue index 9bbce6a..63780d8 100644 --- a/src/views/business/stockOrder.vue +++ b/src/views/business/stockOrder.vue @@ -523,9 +523,13 @@ export default { stockOrderList(this.query) .then(response => { this.loading = false; - this.list = response.data.list || []; - this.total = response.data.total || 0; - this.detailList = []; + if (response.code == 20000) { + this.list = response.data.list || []; + this.total = response.data.total || 0; + this.detailList = []; + } else { + this.$message.error(response.message); + } }) .catch(() => { this.loading = false; diff --git a/src/views/business/stockOrderDelSearch.vue b/src/views/business/stockOrderDelSearch.vue index 647e528..944fd6e 100644 --- a/src/views/business/stockOrderDelSearch.vue +++ b/src/views/business/stockOrderDelSearch.vue @@ -606,9 +606,13 @@ export default { stockOrderList(this.query) .then(response => { this.loading = false; - this.list = response.data.list || []; - this.detailList = []; - this.total = response.data.total || 0; + if (response.code == 20000) { + this.list = response.data.list || []; + this.total = response.data.total || 0; + this.detailList = []; + } else { + this.$message.error(response.message); + } }) .catch(() => { this.loading = false; diff --git a/src/views/business/stockOrderEditor.vue b/src/views/business/stockOrderEditor.vue index 37d2929..271b0c9 100644 --- a/src/views/business/stockOrderEditor.vue +++ b/src/views/business/stockOrderEditor.vue @@ -678,9 +678,13 @@ export default { stockOrderList(this.query) .then(response => { this.loading = false; - this.list = response.data.list || []; - this.detailList = []; - this.total = response.data.total || 0; + if (response.code == 20000) { + this.list = response.data.list || []; + this.total = response.data.total || 0; + this.detailList = []; + } else { + this.$message.error(response.message); + } }) .catch(() => { this.loading = false; diff --git a/src/views/business/stockOrderInvSearch.vue b/src/views/business/stockOrderInvSearch.vue index 2d1945e..0092b01 100644 --- a/src/views/business/stockOrderInvSearch.vue +++ b/src/views/business/stockOrderInvSearch.vue @@ -580,9 +580,13 @@ export default { stockOrderList(this.query) .then(response => { this.loading = false; - this.list = response.data.list || []; - this.detailList = []; - this.total = response.data.total || 0; + if (response.code == 20000) { + this.list = response.data.list || []; + this.total = response.data.total || 0; + this.detailList = []; + } else { + this.$message.error(response.message); + } }) .catch(() => { this.loading = false; diff --git a/src/views/business/stockOrderNew.vue b/src/views/business/stockOrderNew.vue index 59235cb..574e810 100644 --- a/src/views/business/stockOrderNew.vue +++ b/src/views/business/stockOrderNew.vue @@ -632,9 +632,13 @@ export default { stockOrderList(this.query) .then(response => { this.loading = false; - this.list = response.data.list || []; - this.total = response.data.total || 0; - this.detailList = []; + if (response.code == 20000) { + this.list = response.data.list || []; + this.total = response.data.total || 0; + this.detailList = []; + } else { + this.$message.error(response.message); + } }) .catch(() => { this.loading = false; diff --git a/src/views/business/stockOrderNewDistribution.vue b/src/views/business/stockOrderNewDistribution.vue index dd8c3e2..6c83ce0 100644 --- a/src/views/business/stockOrderNewDistribution.vue +++ b/src/views/business/stockOrderNewDistribution.vue @@ -216,7 +216,7 @@
- 所属部门： + 所属科室：
@@ -228,7 +228,7 @@ remote :disabled="codeArray.length>0" clearable="true" reserve-keyword - placeholder="请选择部门" + placeholder="请选择科室" :remote-method="findDeptMethod" :loading="loading" @focus="findDeptMethod('')" @@ -479,6 +479,10 @@ export default { type: Function, required: true, }, + enableDept: { + type: Object, + required: true, + } }, data() { return { diff --git a/src/views/business/stockOrderSearch.vue b/src/views/business/stockOrderSearch.vue index bf0b0cc..7511b69 100644 --- a/src/views/business/stockOrderSearch.vue +++ b/src/views/business/stockOrderSearch.vue @@ -724,9 +724,13 @@ export default { stockOrderList(this.query) .then(response => { this.loading = false; - this.list = response.data.list || []; - this.total = response.data.total || 0; - this.detailList = []; + if (response.code == 20000) { + this.list = response.data.list || []; + this.total = response.data.total || 0; + this.detailList = []; + } else { + this.$message.error(response.message); + } }) .catch(() => { this.loading = false; diff --git a/src/views/business/stockOrderWaitCheck.vue b/src/views/business/stockOrderWaitCheck.vue index bf21e55..39906b0 100644 --- a/src/views/business/stockOrderWaitCheck.vue +++ b/src/views/business/stockOrderWaitCheck.vue @@ -523,9 +523,13 @@ export default { stockOrderList(this.query) .then(response => { this.loading = false; - this.list = response.data.list || []; - this.detailList = []; - this.total = response.data.total || 0; + if (response.code == 20000) { + this.list = response.data.list || []; + this.total = response.data.total || 0; + this.detailList = []; + } else { + this.$message.error(response.message); + } }) .catch(() => { this.loading = false; diff --git a/src/views/inout/DialogSelectInout.vue b/src/views/inout/DialogSelectInout.vue index 63577e9..b9c061f 100644 --- a/src/views/inout/DialogSelectInout.vue +++ b/src/views/inout/DialogSelectInout.vue @@ -160,8 +160,14 @@ filterOrder(this.filterQuery) .then(response => { this.loading = false; - this.list = response.data.list || []; - this.total = response.data.total || 0; + if(response.code ==20000){ + this.list = response.data.list || []; + this.total = response.data.total || 0; + }else { + this.$message.error(response.message); + } + + }) .catch(() => { this.loading = false; diff --git a/src/views/inout/IOAddOrder.vue b/src/views/inout/IOAddOrder.vue index 37d7fb9..c796030 100644 --- a/src/views/inout/IOAddOrder.vue +++ b/src/views/inout/IOAddOrder.vue @@ -214,7 +214,7 @@ filterable clearable="true" reserve-keyword - placeholder="请选择部门信息" + placeholder="请选择科室" :remote-method="findDeptMethod" :loading="loading" @focus="findDeptMethod('')" @@ -233,27 +233,27 @@ - - -
- 允许出库自动缺量补单 - - - 出入库必须校验预验收库 - - 是否查询库存 - - 采集UDI码时进行三期校验 - -
- - - + + + + + + + + + + + + + + + + + + + + +
diff --git a/src/views/inout/IOCheckErrorOrder.vue b/src/views/inout/IOCheckErrorOrder.vue index 5c14cd2..98aba34 100644 --- a/src/views/inout/IOCheckErrorOrder.vue +++ b/src/views/inout/IOCheckErrorOrder.vue @@ -763,8 +763,13 @@ export default { filterOrder(this.filterQuery) .then((response) => { this.loading = false; - this.list = response.data.list || []; - this.total = response.data.total || 0; + if (response.code == 20000) { + this.list = response.data.list || []; + this.total = response.data.total || 0; + + }else { + this.$message.error(response.message); + } this.detailList = []; }) .catch(() => { diff --git a/src/views/inout/IOCheckWaitOrder.vue b/src/views/inout/IOCheckWaitOrder.vue index 6a6165b..2f1517f 100644 --- a/src/views/inout/IOCheckWaitOrder.vue +++ b/src/views/inout/IOCheckWaitOrder.vue @@ -615,10 +615,16 @@ export default { this.filterQuery.customerId = store.getters.customerId; filterOrder(this.filterQuery) .then((response) => { + this.loading = false; - this.list = response.data.list || []; - this.total = response.data.total || 0; + if(response.code == 20000){ + this.list = response.data.list || []; + this.total = response.data.total || 0; + }else { + this.$message.error(response.message); + } this.detailList = []; + }) .catch(() => { this.loading = false; diff --git a/src/views/inout/IOErrorOrder.vue b/src/views/inout/IOErrorOrder.vue index 381e0e2..b326920 100644 --- a/src/views/inout/IOErrorOrder.vue +++ b/src/views/inout/IOErrorOrder.vue @@ -81,27 +81,27 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + @@ -333,7 +333,7 @@ export default { "6": "缺量补录单据", "7": "UDI供应商平台", "8": "平衡补录单据", - "10":"手动补单" + "10": "手动补单" }, storageList: [], subInvList: [], @@ -460,10 +460,15 @@ export default { this.filterQuery.customerId = store.getters.customerId; filterOrder(this.filterQuery) .then((response) => { - console.log(response) + this.loading = false; - this.list = response.data.list || []; - this.total = response.data.total || 0; + if (response.code == 20000) { + this.list = response.data.list || []; + this.total = response.data.total || 0; + } else { + this.$message.error(response.message); + } + }) .catch(() => { this.loading = false; diff --git a/src/views/inventory/invUdiTraceOrder.vue b/src/views/inventory/invUdiTraceOrder.vue index d959cd4..7d7addd 100644 --- a/src/views/inventory/invUdiTraceOrder.vue +++ b/src/views/inventory/invUdiTraceOrder.vue @@ -7,6 +7,7 @@ :model="filterQuery" label-width="480px" size="mini" + v-if="searchVisible" > @@ -115,12 +116,12 @@ >详情 - 删除 - + + + + + + @@ -257,12 +258,20 @@ export default { type: Boolean, default: false, }, + diloadTrue: { + type: Boolean, + default: false, + }, + udiCode: { + type: Object, + required: true, + }, }, data() { return { - query: { - code: null, + filterQuery: { + code: "", batchNo: null, productIdFk: null, customerId: null, @@ -270,6 +279,7 @@ export default { limit: 20, supId: null, }, + searchVisible: true, sitcomScan: false, checkStatus: { 1: "校验异常", @@ -307,15 +317,6 @@ export default { fromCorp: "", }, actDateRange: [], - filterQuery: { - code: null, - batchNo: null, - productIdFk: null, - customerId: null, - page: 1, - limit: 20, - supId: null, - }, detailQuery: { orderId: "", }, @@ -331,7 +332,7 @@ export default { codeDetailVisible: false, successOrderExportPDFSettingVisible: false, total: 0, - loading: true, + loading: false, index: null, formName: null, orderId: "", @@ -763,7 +764,7 @@ export default { sc.onInput = function (text) { //onInput事件在检测到回车键按下或在连续输入后超过500ms没有继续输入时触发 if (text.includes("delete")) { - that.formData.code = ""; + that.filterQuery.code = ""; return; } if (that.sitcomScan) { @@ -777,16 +778,17 @@ export default { }, created() { + if (this.$isNotBlank(this.udiCode)) { + + if (!this.diloadTrue) { + this.searchVisible = false; + } + console.log(this.diloadTrue + "----" + this.searchVisible); + + this.filterQuery.code = this.udiCode; + this.getList(); + } this.getBusType(); - let query = this.$route.query; - this.query = Object.assign(this.query, query); - this.query.limit = parseInt(this.query.limit); - // 加载表格数据 - this.getList(); - let end = new Date(); - let start = new Date(); - start.setTime(start.getTime() - 3600 * 1000 * 24 * 7); - this.actDateRange = [start, end]; }, }; diff --git a/src/views/inventory/sickerUdiTraceOrder.vue b/src/views/inventory/sickerUdiTraceOrder.vue new file mode 100644 index 0000000..3d25ac2 --- /dev/null +++ b/src/views/inventory/sickerUdiTraceOrder.vue @@ -0,0 +1,520 @@ + + + + + + diff --git a/src/views/thrsys/SysUdimsConfig.vue b/src/views/thrsys/SysUdimsConfig.vue index beb96a0..168e411 100644 --- a/src/views/thrsys/SysUdimsConfig.vue +++ b/src/views/thrsys/SysUdimsConfig.vue @@ -220,9 +220,9 @@ prop="action" show-overflow-tooltip > - + diff --git a/src/views/thrsys/ThrProductsAdd.vue b/src/views/thrsys/ThrProductsAdd.vue index e5c2cce..25593c0 100644 --- a/src/views/thrsys/ThrProductsAdd.vue +++ b/src/views/thrsys/ThrProductsAdd.vue @@ -12,7 +12,7 @@
- - -
-
- 进口产品代理商:  -
- -
- - + + + + + + + + + + + + + + +
@@ -324,7 +324,7 @@ export default { qxlb: null, cplx:null, cpms: null, - thirdSys: null, + thirdSysFk: null, cpdls: null }, thirdSys: [], @@ -334,7 +334,7 @@ export default { methods: { saveNewProduct() { this.addProductVisible = false; - if (this.$isBlank(this.newProductData.thirdSys)) { + if (this.$isBlank(this.newProductData.thirdSysFk)) { this.$message.warning("第三方系统不能为空！"); return; } @@ -372,6 +372,8 @@ export default { //清空弹窗数据 this.$emit("closeAddDialog", true); this.closeAddDialog(); + } else { + this.$message.error(res.message); } }).catch((error) => { this.$message.error(error.message); @@ -382,6 +384,8 @@ export default { this.$message.success("添加成功"); //清空弹窗数据 this.closeAddDialog(true); + }else { + this.$message.error(res.message); } }).catch((error) => { this.$message.error(error.message); diff --git a/src/views/userManage/admin/authAdmin.vue b/src/views/userManage/admin/authAdmin.vue index f9a4614..3f08c82 100644 --- a/src/views/userManage/admin/authAdmin.vue +++ b/src/views/userManage/admin/authAdmin.vue @@ -299,6 +299,7 @@ export default { path: "", query: this.query }); + this.query.page = 1; this.getList(); }, handleCurrentChange(val) { diff --git a/src/views/userManage/admin/authRole.vue b/src/views/userManage/admin/authRole.vue index 2892781..634e067 100644 --- a/src/views/userManage/admin/authRole.vue +++ b/src/views/userManage/admin/authRole.vue @@ -378,6 +378,12 @@ export default { } }, formSubmit() { + + if (this.$isBlank(this.formData.name)) { + this.$message.error("请输入角色名称！"); + return; + } + this.$refs["dataForm"].validate(valid => { if (valid) { this.formLoading = true;