meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

车间工艺管理

Browse Source
This commit is contained in:
zhangdingyu
2018-12-05 13:41:02 +08:00
parent dc5434e90d
commit ff28e5f0ac
3 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/utils/request.js
View File

@@ -10,22 +10,7 @@ export const name = `OP8888`
export const upload = `http://localhost:8411/submit/uploadFile.ashx`
export const download = `http://localhost:8411/submit/downloadFile.ashx`
const service = axios.create({
<<<<<<< HEAD
baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
=======
// baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
>>>>>>> 7cdb10d153358b72f95165dd7f3a12ad7675f14d
// baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://192.168.137.85:8411/submit/MESCommonBase.ashx`, // 李鑫
// baseURL: `http://192.168.1.112:8411/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
})

3
src/views/BasicData/PersonnelManagement/index.vue
View File

@@ -538,7 +538,6 @@ export default {
},
addPeople() {
if (this.id) {
<<<<<<< HEAD
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
@@ -548,11 +547,9 @@ export default {
this.$message.error('添加失败')
}
})
=======
this.people_title = '新增人员'
this.people_DFV = true
this.addForm('people_form')
>>>>>>> 7cdb10d153358b72f95165dd7f3a12ad7675f14d
} else {
this.$message.warning(`请选择部门名称`)
}

4
src/views/BasicData/WorkshopProcessMaintenance/index.vue
View File

@@ -222,8 +222,8 @@ export default {
ProcessClassification: [{ required: true, message: '请输入工艺分类名称', trigger: 'blur' }]
},
rules2: {
Process: [{ required: true, message: '请输入工艺名称' }],
ProcessShort: [{ required: true, message: '请输入工艺名称简称' }]
Process: [{ required: true, message: '请输入工艺名称', trigger: 'blur' }],
ProcessShort: [{ required: true, message: '请输入工艺名称简称', trigger: 'blur' }]
},
rules3: {
TechnologicalRequirements: [{ required: true, message: '请输入工艺要求', trigger: 'blur' }]