diff --git a/src/api/Assembly/AssemblyProcessAssignment.js b/src/api/Assembly/AssemblyProcessAssignment.js index fbe7519b..42d429e3 100644 --- a/src/api/Assembly/AssemblyProcessAssignment.js +++ b/src/api/Assembly/AssemblyProcessAssignment.js @@ -30,7 +30,7 @@ export function initPerson() { data: { type: '1', name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', - param: '考核部门编号=17=int' + param: '考核部门编号=9=int' } }) } diff --git a/src/api/Assembly/AssemblyProcessPlanning.js b/src/api/Assembly/AssemblyProcessPlanning.js index 41619c17..229319bb 100644 --- a/src/api/Assembly/AssemblyProcessPlanning.js +++ b/src/api/Assembly/AssemblyProcessPlanning.js @@ -8,7 +8,7 @@ export function initCraftmen() { data: { type: '1', name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', - param: '考核部门编号=17' + param: '考核部门编号=9' } }) } diff --git a/src/api/Assembly/AssemblyQuotaSetting.js b/src/api/Assembly/AssemblyQuotaSetting.js index f1769456..62050c24 100644 --- a/src/api/Assembly/AssemblyQuotaSetting.js +++ b/src/api/Assembly/AssemblyQuotaSetting.js @@ -8,7 +8,7 @@ export function initCraftmen() { data: { type: '1', name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', - param: '考核部门编号=17' + param: '考核部门编号=9' } }) } diff --git a/src/api/WorkshopProcurement/OfflineContract1.js b/src/api/WorkshopProcurement/OfflineContract1.js index 71d1a725..2d2f7bc9 100644 --- a/src/api/WorkshopProcurement/OfflineContract1.js +++ b/src/api/WorkshopProcurement/OfflineContract1.js @@ -59,6 +59,17 @@ export function deleteData(RequisitionList) { } }) } +export function updateStatus(num) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间采购管理_离线合同_导出更改状态', + param: '请购单流水号=' + num + } + }) +} // 查询离线合同明细 export function searchMateriel(num) { return request({ diff --git a/src/views/Assembly/TypicalAssemblyMaintenance/index.vue b/src/views/Assembly/TypicalAssemblyMaintenance/index.vue index 423324e9..f06eeda4 100644 --- a/src/views/Assembly/TypicalAssemblyMaintenance/index.vue +++ b/src/views/Assembly/TypicalAssemblyMaintenance/index.vue @@ -286,7 +286,7 @@ export default { for (let i = 0; i < response.data.length; i++) { this.GroupNumber.push({ label: response.data[i].组号, - value: response.data[i].组号 + value: response.data[i].组件流水号 }) } }) diff --git a/src/views/BasicData/MaterialMaintenance/index.vue b/src/views/BasicData/MaterialMaintenance/index.vue index afd74ae3..bae4bedc 100644 --- a/src/views/BasicData/MaterialMaintenance/index.vue +++ b/src/views/BasicData/MaterialMaintenance/index.vue @@ -63,7 +63,7 @@ - + @@ -97,7 +97,9 @@ export default { MaterialName2: '' }, rules: { - MaterialName: [{ required: true, message: '请输入材料名称', trigger: 'blur' }], + MaterialName: [{ required: true, message: '请输入材料名称', trigger: 'blur' }] + }, + rules1: { MaterialName2: [{ required: true, message: '请输入材料名称', trigger: 'blur' }] } } diff --git a/src/views/WorkshopProcurement/OfflineContract1/index.vue b/src/views/WorkshopProcurement/OfflineContract1/index.vue index df4379eb..8b37e4dc 100644 --- a/src/views/WorkshopProcurement/OfflineContract1/index.vue +++ b/src/views/WorkshopProcurement/OfflineContract1/index.vue @@ -136,7 +136,7 @@ @@ -249,7 +249,7 @@