diff --git a/src/api/MarketingCenter/ContractCapitalManagement.js b/src/api/MarketingCenter/ContractCapitalManagement.js index d2fcf8a7..909c5ad7 100644 --- a/src/api/MarketingCenter/ContractCapitalManagement.js +++ b/src/api/MarketingCenter/ContractCapitalManagement.js @@ -87,6 +87,16 @@ export function searchProjectNumber() { } }) } +export function searchProjectNumber2() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '合同信息管理_项目名称_总_查询_增加限制' + } + }) +} export function searchProjectName(num1) { return request({ url: '', diff --git a/src/utils/request.js b/src/utils/request.js index 9b106373..590710b7 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -7,10 +7,10 @@ export const wsuri = `ws://192.168.1.128:61101//WebMoudule//websocket` export const name = `OP8888` // 创建axios实例 -export const upload = `http://123.56.95.229:8411/submit/uploadFile.ashx` -export const download = `http://123.56.95.229:8411/submit/downloadFile.ashx` +export const upload = `http://localhost:8411/submit/uploadFile.ashx` +export const download = `http://localhost:8411/submit/downloadFile.ashx` const service = axios.create({ - baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, + baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) diff --git a/src/views/BasicData/PersonnelManagement/index.vue b/src/views/BasicData/PersonnelManagement/index.vue index 76cbc503..e8d75235 100644 --- a/src/views/BasicData/PersonnelManagement/index.vue +++ b/src/views/BasicData/PersonnelManagement/index.vue @@ -3,7 +3,7 @@ - 新增 + 新增 编辑 删除 @@ -15,7 +15,8 @@ 新增 - + + @@ -29,7 +30,9 @@ - + + + @@ -176,18 +179,18 @@ - - - - - - - - - - - - + + + + + + +
+ 取消 + 确定 + 确定 +
+ @@ -350,7 +353,8 @@ export default { Title: [{ required: true, message: '请输入', trigger: 'change' }], PositionStatus: [{ required: true, message: '请输入', trigger: 'change' }], Education: [{ required: true, message: '请输入', trigger: 'change' }], - Post: [{ required: true, message: '请输入', trigger: 'change' }] + Post: [{ required: true, message: '请输入', trigger: 'change' }], + DepartmentName: [{ required: true, message: '请输入', trigger: 'blur' }] }, SexData: [{ value: 1, @@ -362,7 +366,9 @@ export default { EducationDate: [], PostData: [], multipleSelection: [], - nodeName1: [] + nodeName1: [], + count1: 0, + count2: 0 } }, created() { @@ -415,10 +421,14 @@ export default { } } }, - handleAdd() { + handleAdd(formName) { this.department_Title = '新增部门' this.department_DFV = true - this.addForm('department_Form') + this.department_Form.DepartmentName = '' + this.count1 = this.count1 + 1 + if (this.count1 !== 1) { + this.$refs[formName].resetFields() + } }, handleEdit() { this.addForm('department_Form') @@ -430,43 +440,75 @@ export default { this.$message.warning(`请选择要修改的部门`) } }, - submitAdd() { - this.department_DFV = false - if (this.id) { - addDepartmentName(this.id, this.department_Form.DepartmentName, 0).then(response => { - console.log(response.data[0].result === '1') - if (response.data[0].result === '1') { - this.getTreeData() - this.$message.success('添加成功') + submitAdd(formName) { + this.$refs[formName].validate((valid) => { + if (valid) { + this.department_DFV = false + if (this.id) { + addDepartmentName(this.id, this.department_Form.DepartmentName, 0).then(response => { + if (response.data[0].result === '1') { + this.getTreeData() + this.$message.success('添加成功') + } else { + this.$message.error('添加失败') + } + }) } else { - this.$message.error('添加失败') + addDepartmentName(0, this.department_Form.DepartmentName, 0).then(response => { + if (response.data[0].result === '1') { + this.getTreeData() + this.$message.success('添加成功') + } else { + this.$message.error('添加失败') + } + }) } - }) - } else { - addDepartmentName(0, this.department_Form.DepartmentName, 0).then(response => { - if (response.data[0].result === '1') { - this.getTreeData() - this.$message.success('添加成功') - } else { - this.$message.error('添加失败') - } - }) - } - }, - submitEdit() { - this.department_DFV = false - editList(this.id, this.department_Form.DepartmentName).then(response => { - if (response.data[0].result === '1') { - this.getTreeData() - this.$message.success('编辑成功') } else { - this.$message.error('编辑失败') + return false + } + }) + }, + submitEdit(formName) { + this.$refs[formName].validate((valid) => { + if (valid) { + this.department_DFV = false + editList(this.id, this.department_Form.DepartmentName).then(response => { + if (response.data[0].result === '1') { + this.getTreeData() + this.$message.success('编辑成功') + } else { + this.$message.error('编辑失败') + } + }) + } else { + return false } }) }, deleteTable() { if (this.id) { - this.deleteRow(delList, this.id, function() { this.getTreeData() }) + this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + delList(this.id).then(response => { + if (response.data[0].result === '1') { + this.getTreeData() + this.i = 1 + this.id = '' + this.$message({ + message: '已被成功删除', + type: 'success' + }) + } + }) + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消删除' + }) + }) } else { this.$message.warning(`请选择部门`) } @@ -504,6 +546,7 @@ export default { if (this.id) { addPeople(this.id, this.people_form.Sex, this.people_form.Education, this.people_form.Address, this.people_form.Nation, this.people_form.Post, this.people_form.AccountNumber, this.people_form.Password, this.people_form.Name, this.people_form.IDcard, this.people_form.TimeOfEntry, this.people_form.Birthday, this.people_form.ContactInformation).then(response => { if (response.data[0].result === '1') { + this.i = 1 this.handleNodeClick() this.$message.success('添加成功') } else { diff --git a/src/views/MarketingCenter/ContractCapitalManagement/index.vue b/src/views/MarketingCenter/ContractCapitalManagement/index.vue index 33c7d669..935b26dc 100644 --- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue +++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue @@ -12,7 +12,7 @@ 销售经理 查询收款计划 - 新增收款计划 + 新增收款计划 查看收款信息 @@ -42,11 +42,6 @@ {{ scope.row.机床名称 }} - - - - - @@ -119,12 +114,6 @@