diff --git a/src/api/production.js b/src/api/production.js index 6261948..ec80b7a 100644 --- a/src/api/production.js +++ b/src/api/production.js @@ -64,6 +64,8 @@ export const getAllWorkCenterDataForUser=data => createAPI(`dailyPlan/getAllWork export const getWorkCenterUserData=data => createAPI(`dailyPlan/getWorkCenterUserData`, 'post', data); export const addUserSkill=data => createAPI(`dailyPlan/addUserSkill`, 'post', data); export const deleteUserSkill=data => createAPI(`dailyPlan/deleteUserSkill`, 'post', data); +export const addUserSkillAll=data => createAPI(`dailyPlan/addUserSkillAll`, 'post', data); +export const deleteUserSkillAll=data => createAPI(`dailyPlan/deleteUserSkillAll`, 'post', data); export const getPartNoOnHand= data => createAPI(`dailyPlan/getPartNoOnHand`, 'post', data); diff --git a/src/views/modules/Abnormal/AbnormalFeedBack.vue b/src/views/modules/Abnormal/AbnormalFeedBack.vue index d2b52dc..406b457 100644 --- a/src/views/modules/Abnormal/AbnormalFeedBack.vue +++ b/src/views/modules/Abnormal/AbnormalFeedBack.vue @@ -258,6 +258,7 @@ }, searchData:{ + userId:this.$store.state.user.name, startDate:'', endDate:'', abnormalCode:'', diff --git a/src/views/modules/print/print_outBox_label.js b/src/views/modules/print/print_outBox_label.js index 3e53637..b2f3f31 100644 --- a/src/views/modules/print/print_outBox_label.js +++ b/src/views/modules/print/print_outBox_label.js @@ -190,7 +190,7 @@ export function printOutBoxLabel(printList) { LODOP.SET_PRINT_STYLEA(0,"FontSize",12); LODOP.SET_PRINT_STYLEA(0,"Alignment",2); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.SET_PRINT_STYLEA(1,"AngleOfPageInside",-90); + // LODOP.SET_PRINT_STYLEA(1,"AngleOfPageInside",-90); } // LODOP.PRINT_DESIGN(); diff --git a/src/views/modules/sys/user.vue b/src/views/modules/sys/user.vue index 29f7d31..dd0204c 100644 --- a/src/views/modules/sys/user.vue +++ b/src/views/modules/sys/user.vue @@ -131,6 +131,12 @@
删除<<
+
+ 全部添加 +
+
+ 全部删除 +
已选加工中心: @@ -179,7 +185,9 @@ getAllWorkCenterDataForUser, getWorkCenterUserData, addUserSkill, - deleteUserSkill + deleteUserSkill, + addUserSkillAll, + deleteUserSkillAll, } from "@/api/production.js" export default { data () { @@ -362,6 +370,30 @@ this.skillRow1=null; }) }, + addSkillAll(){ + this.$confirm("是否添加所有加工中心", '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + let inSkillData={ + userId:this.userData.userId, + user:this.$store.state.user.name, + } + addUserSkillAll(inSkillData).then(({data}) => { + let inData={ + user:this.userData.userId, + } + getAllWorkCenterDataForUser(inData).then(({data}) => { + this.skillList1 = data.rows; + }) + getWorkCenterUserData(inData).then(({data}) => { + this.skillList2 = data.rows; + }) + this.skillRow1=null; + }) + }).catch(() => {}) + }, deleteSkill(){ if(this.skillRow2==null){ this.$alert("请选择已选加工中心技能!", '错误', { @@ -388,6 +420,29 @@ this.skillRow2=null; }) }, + deleteSkillAll(){ + this.$confirm("是否删除所有加工中心", '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + let inSkillData={ + userId:this.userData.userId, + } + deleteUserSkillAll(inSkillData).then(({data}) => { + let inData={ + user:this.userData.userId, + } + getAllWorkCenterDataForUser(inData).then(({data}) => { + this.skillList1 = data.rows; + }) + getWorkCenterUserData(inData).then(({data}) => { + this.skillList2 = data.rows; + }) + this.skillRow2=null; + }) + }).catch(() => {}) + }, } }