diff --git a/src/views/hrm/attendance.vue b/src/views/hrm/attendance.vue
index ca498164..49ba006c 100644
--- a/src/views/hrm/attendance.vue
+++ b/src/views/hrm/attendance.vue
@@ -221,13 +221,7 @@
methods: {
getDept() {
this.$API.system.dept.list.req({ page: 0,type:'dept'}).then(res=>{
- let data = [];
- res.forEach(item => {
- if(item.parent=='3423856735881117696'){
- data.push(item)
- }
- });
- this.deptData = data;
+ this.deptData = res;
});
},
handleQuery(){
diff --git a/src/views/hrm/employee_photon.vue b/src/views/hrm/employee_photon.vue
index ba227274..822e04c3 100644
--- a/src/views/hrm/employee_photon.vue
+++ b/src/views/hrm/employee_photon.vue
@@ -157,14 +157,7 @@ export default {
methods: {
getDept() {
this.$API.system.dept.list.req({ page: 0,type:'dept'}).then(res=>{
- let data = [];
- res.forEach(item => {
- if(item.parent=='3423856735881117696'){
- data.push(item)
- }
- });
- console.log(data)
- this.deptData = data;
+ this.deptData = res;
});
},
//添加
diff --git a/src/views/hrm/performance.vue b/src/views/hrm/performance.vue
index 660f1f32..4cd0b809 100644
--- a/src/views/hrm/performance.vue
+++ b/src/views/hrm/performance.vue
@@ -82,13 +82,7 @@
methods: {
getDept() {
this.$API.system.dept.list.req({ page: 0,type:'dept'}).then(res=>{
- let data = [];
- res.forEach(item => {
- if(item.parent=='3423856735881117696'){
- data.push(item)
- }
- });
- this.deptData = data;
+ this.deptData = res;
});
},
getTableData(){
diff --git a/src/views/inm/mioitem_check.vue b/src/views/inm/mioitem_check.vue
index ad752df2..e1c6640a 100644
--- a/src/views/inm/mioitem_check.vue
+++ b/src/views/inm/mioitem_check.vue
@@ -371,7 +371,8 @@
- {{ objitem.count }}
+
+
@@ -379,55 +380,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -510,9 +513,10 @@ export default {
this.getUserList();
let that = this;
if(that.type=='pur_in'){
+ console.log('objitem',that.objitem)
that.form.material_name = that.objitem.material_name;
that.form.batch = that.objitem.batch;
- that.form.count_bag = that.objitem.count;
+ that.form.count_bag = that.objitem.count_bag;
}
},
methods: {
@@ -544,7 +548,7 @@ export default {
that.weight_kgs.forEach(item=>{
sum = sum+item.value;
})
- that.form.count_bag_weight_all = sum/that.weight_kgs.length*that.objitem.count;
+ that.form.count_bag_weight_all = sum/that.weight_kgs.length*that.form.count_bag;
},
countChange(){
@@ -565,7 +569,7 @@ export default {
let obj = {};
obj.test_date = that.form.test_date;
obj.test_user = that.form.test_user;
- obj.count_bag = that.objitem.count;
+ obj.count_bag = that.objitem.count_bag;
obj.weight_kgs = arr;
obj.is_testok = that.form.is_testok;
console.log(obj)
@@ -598,6 +602,7 @@ export default {
Object.assign(that.form, data);
// that.form.test_group = that.form.split(',');
that.weight_kgs = [];
+ console.log(data.count_bag)
console.log(data.weight_kgs)
if(data.weight_kgs.length>0){
that.form.weight_kgs_count = data.weight_kgs.length;
@@ -608,7 +613,7 @@ export default {
obj.value = item;
that.weight_kgs.push(obj)
})
- that.form.count_bag_weight_all =sum/data.weight_kgs.length*data.count;
+ that.form.count_bag_weight_all =sum/data.weight_kgs.length*data.count_bag;
}
},
diff --git a/src/views/mtm/process_form.vue b/src/views/mtm/process_form.vue
index 53f66fb6..a7dc0835 100644
--- a/src/views/mtm/process_form.vue
+++ b/src/views/mtm/process_form.vue
@@ -98,16 +98,8 @@
},
methods: {
getDepts(){
- this.$API.system.dept.list.req({page:0}).then(res=>{
- debugger;
- console.log(res)
- let data = [];
- res.forEach(item => {
- if(item.parent=='3423856735881117696'){
- data.push(item)
- }
- });
- this.deptOptions = data;
+ this.$API.system.dept.list.req({page:0,type:'dept'}).then(res=>{
+ this.deptOptions = res;
});
},
//显示
diff --git a/src/views/qm/behavior_form.vue b/src/views/qm/behavior_form.vue
index 7a21ce91..9e2bd0eb 100644
--- a/src/views/qm/behavior_form.vue
+++ b/src/views/qm/behavior_form.vue
@@ -250,12 +250,7 @@ export default {
//获取部门列表
getDeptOptions() {
this.$API.system.dept.list.req({ page: 0, type__in: 'dept' }).then((res) => {
- this.deptOptions = [];
- res.forEach(item=>{
- if(item.parent=='3423856735881117696'){
- this.deptOptions.push(item)
- }
- })
+ this.deptOptions = res;
});
},
//获取员工
diff --git a/src/views/qm/first_check.vue b/src/views/qm/first_check.vue
index 1fd57340..d8c71d25 100644
--- a/src/views/qm/first_check.vue
+++ b/src/views/qm/first_check.vue
@@ -46,7 +46,7 @@
{
- this.deptOptions = [];
- res.forEach(item=>{
- if(item.parent=='3423856735881117696'){
- this.deptOptions.push(item)
- }
- })
+ this.deptOptions = res;
});
},
//获取员工
@@ -228,7 +223,13 @@ export default {
getProcess(){
let that = this;
this.$API.mtm.process.list.req({page:0}).then(res=>{
- that.processOptions = res;
+ let arr = [];
+ res.forEach(item => {
+ if(item.name.indexOf('磨')>-1){
+ arr.push(item);
+ }
+ })
+ that.processOptions = arr;
})
},
//提交
diff --git a/src/views/qm/product_form.vue b/src/views/qm/product_form.vue
index 3e85e835..a305a5f0 100644
--- a/src/views/qm/product_form.vue
+++ b/src/views/qm/product_form.vue
@@ -184,12 +184,7 @@ export default {
//获取部门列表
getDeptOptions() {
this.$API.system.dept.list.req({ page: 0, type__in: 'dept' }).then((res) => {
- this.deptOptions = [];
- res.forEach(item=>{
- if(item.parent=='3423856735881117696'){
- this.deptOptions.push(item)
- }
- })
+ this.deptOptions = res;
});
},
//获取员工
diff --git a/src/views/statistics/user_statistics.vue b/src/views/statistics/user_statistics.vue
index e6361c5e..bf9547f3 100644
--- a/src/views/statistics/user_statistics.vue
+++ b/src/views/statistics/user_statistics.vue
@@ -119,14 +119,8 @@
methods:{
getDept() {
this.$API.system.dept.list.req({ page: 0,type:'dept'}).then(res=>{
- let data = [];
- res.forEach(item => {
- if(item.parent=='3423856735881117696'){
- data.push(item)
- }
- });
- this.deptData = data;
- this.queryBelongDept = data[0].name;
+ this.deptData = res;
+ this.queryBelongDept = res[0].name;
});
},
queryTypeChange(value){
diff --git a/src/views/wpm/handover_form.vue b/src/views/wpm/handover_form.vue
index 79695d4f..34334e5a 100644
--- a/src/views/wpm/handover_form.vue
+++ b/src/views/wpm/handover_form.vue
@@ -123,12 +123,7 @@ export default {
//获取部门列表
getDeptOptions() {
this.$API.system.dept.list.req({ page: 0, type__in: 'dept' }).then((res) => {
- this.deptOptions = [];
- res.forEach(item => {
- if (item.parent == '3423856735881117696') {
- this.deptOptions.push(item)
- }
- })
+ this.deptOptions = res;
});
},
//获取车间物料