diff --git a/src/api/TechnologyCenter/CreatePackingList.js b/src/api/TechnologyCenter/CreatePackingList.js index 82c9e20b..6080da49 100644 --- a/src/api/TechnologyCenter/CreatePackingList.js +++ b/src/api/TechnologyCenter/CreatePackingList.js @@ -148,7 +148,7 @@ export function deleteFileData(num) { data: { type: '2', name: 'PDM_装箱单_随机技术文件_删除数据', - param: `序号=${num}` + param: `文件编号=${num}` } }) } @@ -160,7 +160,7 @@ export function editFileData(name, number, remark, num) { data: { type: '2', name: 'PDM_装箱单_随机技术文件_修改数据', - param: `名称=${name}&数量=${number}&备注=${remark}&序号=${num}` + param: `名称=${name}&数量=${number}&备注=${remark}&文件编号=${num}` } }) } @@ -196,24 +196,24 @@ export function deleteSpareData(num) { data: { type: '2', name: 'PDM_装箱单_备件_删除数据', - param: `序号=${num}` + param: `备件编号=${num}` } }) } -export function editSpareData(name, specification, number, unit, remark, num) { +export function editSpareData(name, specification, unit, number, remark, num) { return request({ url: '', method: 'post', data: { type: '2', name: 'PDM_装箱单_备件_修改数据', - param: `名称=${name}&规格=${specification}&数量=${number}&单位=${unit}&备注=${remark}&序号=${num}` + param: `名称=${name}&规格=${specification}&数量=${number}&单位=${unit}&备注=${remark}&备件编号=${num}` } }) } -export function addSpareData(name, specification, number, unit, remark, num) { +export function addSpareData(name, specification, unit, number, remark, num) { return request({ url: '', method: 'post', diff --git a/src/icons/svg/InterBudgetaryBudgets.svg b/src/icons/svg/InterBudgetaryBudgets.svg new file mode 100644 index 00000000..3b6092af --- /dev/null +++ b/src/icons/svg/InterBudgetaryBudgets.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/OutFactoryMaintenance.svg b/src/icons/svg/OutFactoryMaintenance.svg new file mode 100644 index 00000000..232d82de --- /dev/null +++ b/src/icons/svg/OutFactoryMaintenance.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/OutsourcingDataMaintenance.svg b/src/icons/svg/OutsourcingDataMaintenance.svg new file mode 100644 index 00000000..c0666d55 --- /dev/null +++ b/src/icons/svg/OutsourcingDataMaintenance.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/OutsourcingInspectionEntry.svg b/src/icons/svg/OutsourcingInspectionEntry.svg new file mode 100644 index 00000000..3db054d4 --- /dev/null +++ b/src/icons/svg/OutsourcingInspectionEntry.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/OutsourcingPaymentPlanManagement.svg b/src/icons/svg/OutsourcingPaymentPlanManagement.svg new file mode 100644 index 00000000..3644bfe7 --- /dev/null +++ b/src/icons/svg/OutsourcingPaymentPlanManagement.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/OutsourcingTaskExecution.svg b/src/icons/svg/OutsourcingTaskExecution.svg new file mode 100644 index 00000000..0ac127f6 --- /dev/null +++ b/src/icons/svg/OutsourcingTaskExecution.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/PreorderAssociation.svg b/src/icons/svg/PreorderAssociation.svg new file mode 100644 index 00000000..422943c0 --- /dev/null +++ b/src/icons/svg/PreorderAssociation.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/UnqualifiedTreatment.svg b/src/icons/svg/UnqualifiedTreatment.svg new file mode 100644 index 00000000..bd787aef --- /dev/null +++ b/src/icons/svg/UnqualifiedTreatment.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/utils/curd.js b/src/utils/curd.js index 1436c6b3..d1374579 100644 --- a/src/utils/curd.js +++ b/src/utils/curd.js @@ -167,6 +167,7 @@ export default { // 4) 回调函数，必须 Vue.prototype.addTable = function(requestData, param, form, callback) { if (type(callback) === 'function' && type(requestData) === 'function' && type(form) === 'string') { + console.log(this.$refs[form]) this.$refs[form].validate((valid) => { if (valid) { requestData(...param).then(response => { diff --git a/src/views/BasicData/PersonnelManagement/index.vue b/src/views/BasicData/PersonnelManagement/index.vue index 76cbc503..7e38a3db 100644 --- a/src/views/BasicData/PersonnelManagement/index.vue +++ b/src/views/BasicData/PersonnelManagement/index.vue @@ -15,7 +15,8 @@ 新增 - + + @@ -29,7 +30,9 @@ - + + + @@ -176,18 +179,18 @@ - - - - - - - - - - - - + + + + + + +
+ 取消 + 确定 + 确定 +
+ @@ -467,6 +470,7 @@ export default { deleteTable() { if (this.id) { this.deleteRow(delList, this.id, function() { this.getTreeData() }) + this.i = 1 } else { this.$message.warning(`请选择部门`) } diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue index 8a6617ee..3c49e2c3 100644 --- a/src/views/ManufacturingCenter/InitialProduction/index.vue +++ b/src/views/ManufacturingCenter/InitialProduction/index.vue @@ -283,7 +283,7 @@ - + diff --git a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue index 363e9397..5c52f099 100644 --- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue +++ b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue @@ -29,7 +29,7 @@ diff --git a/src/views/ManufacturingCenter/ProcessingStatus/index.vue b/src/views/ManufacturingCenter/ProcessingStatus/index.vue index 33fe4419..87f6c63d 100644 --- a/src/views/ManufacturingCenter/ProcessingStatus/index.vue +++ b/src/views/ManufacturingCenter/ProcessingStatus/index.vue @@ -40,11 +40,11 @@ 查询 进度颜色： - 拖期 即将拖期 如期 工序外协 + 报废 @@ -396,7 +396,6 @@ export default { this.Groups = [] if (this.project !== '') { getMachines(this.project).then(response => { - console.log(response.data) for (let i = 0; i < response.data.length; i++) { this.Machines.push({ label: response.data[i].机床图号, diff --git a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue index 22451047..a16a697c 100644 --- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue +++ b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue @@ -173,7 +173,7 @@ v-loading="listLoading1" :data="tableData1" class="table" - border + borde style="max-height: 500px" height="500"> @@ -1224,6 +1224,7 @@ export default { } }).then(() => { this.tableData1.push(this.result[i]) + console.log(this.tableData1) selection2(this.工艺计划流水号[this.indexAdjust]).then(response => { // 刷新对话框显示和颜色 for (let i = 0; i < response.data.length; i++) { this.partType = response.data[i].零件类型 diff --git a/src/views/ManufacturingCenter/QuotaFormulation/index.vue b/src/views/ManufacturingCenter/QuotaFormulation/index.vue index e893d321..63d20dc6 100644 --- a/src/views/ManufacturingCenter/QuotaFormulation/index.vue +++ b/src/views/ManufacturingCenter/QuotaFormulation/index.vue @@ -308,6 +308,7 @@ export default { this.result += parseInt(response.data[0].result) if (this.result === this.tableData.length) { this.$message.success('保存成功') + this.typeChange() } else if (response.data[0].result === '0') { this.$message.error('第' + (i + 1) + '行保存失败') } diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue index d82822f5..114b821e 100644 --- a/src/views/ManufacturingCenter/StatusQuery/index.vue +++ b/src/views/ManufacturingCenter/StatusQuery/index.vue @@ -122,10 +122,10 @@ - - - - + + + +
- 取消 - 确定 + 取消 + 确定
@@ -267,6 +267,7 @@ export default { groupNum: null, // 组件流水号 partNumber: '', // 零件号 partStateValue: null, // 零件状态 + partStateValue1: null, partState: [], // 零件状态数组 partTypeValue: null, // 零件类型 num: null, @@ -300,15 +301,7 @@ export default { }, { value: 2, label: '外协生产' - }], - form: { - 零件状态: null - }, - rules: { - 零件状态: [ - { required: true, message: '请选择零件状态', trigger: 'change' } - ] - } + }] } }, created() { @@ -442,34 +435,24 @@ export default { this.dialogFormVisible3 = false }, handleEdit(row) { - if (this.$refs['form'] !== undefined) { - this.$refs['form'].resetFields() - } - this.form = {} + console.log(row) this.title = '编辑' + this.partStateValue1 = parseInt(row.考核状态) + 2 this.dialogFormVisible4 = true this.num = row.工艺计划流水号 }, - submitEdit(formName) { // 提交编辑 - this.$refs[formName].validate((valid) => { - if (valid) { - editData(this.num, this.form.零件状态).then(response => { - if (response.data[0].result === '1') { - this.$message.success('编辑成功') - this.dialogFormVisible4 = false - this.pageCurrent = 1 - this.searchData() - } else { this.$message.error('编辑失败') } - }) - } else { - return false - } + submitEdit() { // 提交编辑 + editData(this.num, this.partStateValue1).then(response => { + if (response.data[0].result === '1') { + this.$message.success('编辑成功') + this.dialogFormVisible4 = false + this.pageCurrent = 1 + this.searchData() + } else { this.$message.error('编辑失败') } }) }, - cancel(formName) { // 取消 - this.form = {} + cancel() { // 取消 this.dialogFormVisible4 = false - this.$refs[formName].resetFields() }, handleSizeChange(val) { this.pageSize = val diff --git a/src/views/MarketingCenter/ContractCapitalManagement/index.vue b/src/views/MarketingCenter/ContractCapitalManagement/index.vue index 9c479d7b..4e298a0a 100644 --- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue +++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue @@ -475,6 +475,7 @@ diff --git a/src/views/TechnologyCenter/CreatePackingList/index.vue b/src/views/TechnologyCenter/CreatePackingList/index.vue index ee3a44f7..9be6bbab 100644 --- a/src/views/TechnologyCenter/CreatePackingList/index.vue +++ b/src/views/TechnologyCenter/CreatePackingList/index.vue @@ -260,7 +260,7 @@