0412 新看板

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);
 
 

src/views/modules/Abnormal/AbnormalFeedBack.vue

@@ -258,6 +258,7 @@
         },
 
         searchData:{
+          userId:this.$store.state.user.name,
           startDate:'',
           endDate:'',
           abnormalCode:'',

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();

src/views/modules/sys/user.vue

@@ -131,6 +131,12 @@
           <div style="margin-top: 20px">
             <el-button type="primary" @click="deleteSkill()">删除<<</el-button>
           </div>
+          <div style="margin-top: 20px">
+            <el-button type="primary" @click="addSkillAll()">全部添加</el-button>
+          </div>
+          <div style="margin-top: 20px">
+            <el-button type="primary" @click="deleteSkillAll()">全部删除</el-button>
+          </div>
         </el-main>
         <el-main style="width: 300px">
           <span  style="font-size: 12px" >已选加工中心：</span>
@@ -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(() => {})
+      },
     }
   }
 </script>