diff --git a/src/views/basic/UdiInfoManage.vue b/src/views/basic/UdiInfoManage.vue index 3f8c1da..38b9cea 100644 --- a/src/views/basic/UdiInfoManage.vue +++ b/src/views/basic/UdiInfoManage.vue @@ -799,7 +799,7 @@ export default { handleModifyClick(row) { this.editDialogVisible = true; this.editQuery = row; - + this.checked = false; this.isUseDyValue = row.isUseDy == 1; let ttquery = { diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue index 57e46e1..f1ce1ed 100644 --- a/src/views/basic/invWarehouse.vue +++ b/src/views/basic/invWarehouse.vue @@ -390,7 +390,7 @@ - + 禁用 正常 @@ -763,7 +763,6 @@ export default { }); }) .catch(() => { - this.$message.info("取消删除"); }); } }, @@ -885,6 +884,10 @@ export default { }); }, addUserData() { + if (this.selectUserList.length === 0) { + this.$message.error("请选择需要添加的用户"); + return; + } this.userFormVisible = false; let query = { code: this.currentCode, @@ -904,20 +907,6 @@ export default { this.$message.error("添加失败"); }); }, - statusChange() { - if (this.formData.status == 0) { - let query = { - code: this.formData.code - }; - disableWarehouse(query).then((res) => { - if (res.code != 20000) { - this.formData.status = 1; - this.$message.error(res.message); - } - }).catch((error) => { - }); - } - }, addBussinessType() { if (this.currentCode == null || this.currentCode == "") { this.$message.error("请先选择仓库"); diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 6e42bae..63d3ac9 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -317,8 +317,16 @@ export default { this.company = response.data; }); }, + // 刷新表单 + resetForm() { + this.$nextTick(() => { + this.$refs["passwordFormData"].resetFields(); + this.$refs["passwordFormData"].clearValidate(); + }); + }, // 显示修改密码界面 handlePassword() { + this.resetForm(); this.passwordFormVisible = true; this.passwordFormData = { oldPassword: "", diff --git a/src/views/product/UnitManage.vue b/src/views/product/UnitManage.vue index ed824c3..19a8d02 100644 --- a/src/views/product/UnitManage.vue +++ b/src/views/product/UnitManage.vue @@ -59,13 +59,6 @@ >编辑 - - +
@@ -114,7 +107,7 @@
企业自定义ID 
- + @@ -194,7 +187,7 @@
拼音码 
- + @@ -205,102 +198,13 @@
- 取消 - 取消 + 提交
- - - - -
- - - - - - -
- - - - - - -
- - - -
- - - - -
- - - -
- - - - -
- 取消 - 提交 - -
- - - - - - -
@@ -330,13 +234,11 @@ export default { unitId: null, thirdId: null, name: null, - spell: null, creditNo: null, pinyinCode: null, contact: null, mobile: null, - corpType: null, - outType: null + corpType: null }, editLogin: { platformId: null, @@ -353,27 +255,12 @@ export default { }, spellUpdate: true, platformVisible: false, - editLoginVisible: false, checked: false, editDialogVisible: false, list: [], platformList: [], total: 0, multipleSelection: [], - rules: { - name: [ - {required: true, message: "请输入往来单位名称", trigger: "change"} - ], - creditNo: [ - {required: true, message: "请输入社会信用号", trigger: "change"} - ], - corpType: [ - {required: true, message: "请选择往来单位类型", trigger: "change"} - ], - pinyinCode: [ - {required: true, message: "请输入拼音码", trigger: "change"} - ] - }, editType: 0, editTypeMap: { 0: "新增往来单位", @@ -415,6 +302,12 @@ export default { }; this.getList(); }, + // 刷新表单 + resetForm() { + this.$nextTick(() => { + this.$refs['editQuery'].resetFields(); + }); + }, search() { this.query.page = 1; this.getList(); @@ -468,7 +361,7 @@ export default { cancelDialog() { this.editDialogVisible = false; - this.editLoginVisible = false; + this.getList(); }, handleModifyClick(row) { @@ -476,35 +369,10 @@ export default { this.editDialogVisible = true; this.editQuery = row; }, - handleLinkClick(row) { - if (row.platformId != null) { - //已经绑定过 - this.$confirm("是否需要重新关联自助平台?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning" - }).then(() => { - this.editType = 2; - this.editLoginVisible = true; - this.editLogin = row; - }).catch(() => { - }); - } else { - this.editType = 2; - this.editLoginVisible = true; - this.editLogin = row; - } - }, handleAddClick() { this.editType = 0; this.editDialogVisible = true; - this.editQuery = { - unitId: null, - thirdId: null, - name: null, - spell: null, - creditNo: null - }; + this.resetForm(); var timestamp3 = new Date().getTime(); this.editQuery.unitId = timestamp3; }, @@ -576,36 +444,9 @@ export default { .catch(() => { }); }, - linkSubmit() { - this.$refs["editLogin"].validate((valid) => { - if (valid) { - linkPlatform(this.editLogin) - .then((response) => { - if (response.code == 20000) { - this.getList(); - this.$message({ - type: "success", - message: "关联成功" - }); - this.cancelDialog(); - } else { - this.$message.error(response.message); - } - }) - .catch(() => { - }); - - } - }); - }, - - exportTxt() { - }, - handleSelectionChange(val) { this.multipleSelection = val; }, - handleCurrentChange(val) { this.query.page = val; this.getList(); diff --git a/src/views/product/udiRelevance.vue b/src/views/product/udiRelevance.vue index b8a89bb..e50acd0 100644 --- a/src/views/product/udiRelevance.vue +++ b/src/views/product/udiRelevance.vue @@ -282,6 +282,10 @@ export default { }, combine() { let selectData = this.multipleUdiSelection; + if (selectData.length === 0) { + this.$message.error("请选入器械信息"); + return; + } var ids = []; selectData.forEach((obj, index) => { ids.push(obj.uuid); diff --git a/src/views/userManage/param/systemPDFTemplate.vue b/src/views/userManage/param/systemPDFTemplate.vue index d0488db..5f8eb6e 100644 --- a/src/views/userManage/param/systemPDFTemplate.vue +++ b/src/views/userManage/param/systemPDFTemplate.vue @@ -327,6 +327,7 @@ import {BASE_URL, SERVER_IP} from "../../../config/app"; import {authRoleAuthList} from "../../../api/auth/authRole"; import {saveAs} from 'file-saver'; import {demoPrint} from "@/api/itextpdf/itextpdf"; +import {isBlank} from "@/utils/strUtil"; const formJson = { id: "", @@ -578,7 +579,6 @@ export default { previewTemplate(row) { }, showFieldExpain(row) { - this.currentRow = row.fieldExplain.replace('\\\n', '
'); this.centerDialogVisible = true; // const {href} = this.$router.resolve({//打开新窗口页面 @@ -603,15 +603,10 @@ export default { this.index = index; this.formName = "update"; this.uploadDisabled = true; - // this.fileList.push(this.formData.path); - // this.jrxmlFileList.push(this.formData.jrxmlPath) }, - - handleAddForm(row) { this.formVisible = true; this.formData = JSON.parse(JSON.stringify(formJson)); - // this.fileList = []; this.formName = "add"; this.uploadDisabled = false; }, @@ -627,7 +622,6 @@ export default { } this.$refs["dataForm"].validate(valid => { if (valid) { - this.submitTemplate(); // if (!this.uploadDisabled) { @@ -712,11 +706,14 @@ export default { this.$message.error("上传失败：" + response.message); } }, - - submitTemplate() { this.$refs["dataForm"].validate(valid => { if (valid) { + if (isBlank(this.formData.path) || isBlank(this.formData.jrxmlPath)) { + this.$message.error("请上传模板文件"); + return; + } + this.formLoading = true; let data = Object.assign({}, this.formData); data.name = data.name.trim(); @@ -731,6 +728,7 @@ export default { } this.$message.success("操作成功"); this.formVisible = false; + this.getList(); }) .catch(() => { this.formLoading = false; diff --git a/src/views/userManage/platform.vue b/src/views/userManage/platform.vue index 60dbd0e..5a49249 100644 --- a/src/views/userManage/platform.vue +++ b/src/views/userManage/platform.vue @@ -183,11 +183,17 @@ export default { formSubmit() { this.$refs["dataForm"].validate((valid) => { if (valid) { + this.loading = true; updatePlatform(this.formData) .then((response) => { - this.loading = false; - this.cancelDialog(); - this.getList(); + if (response.code === 20000) { + this.loading = false; + this.cancelDialog(); + this.getList(); + } else { + this.$message.error(response.message); + this.loading = false; + } }) .catch(() => { this.cancelDialog();