diff --git a/src/views/bigScreen/gxerp/index_daojiao.vue b/src/views/bigScreen/gxerp/index_daojiao.vue
index e60e8cab..9193611f 100644
--- a/src/views/bigScreen/gxerp/index_daojiao.vue
+++ b/src/views/bigScreen/gxerp/index_daojiao.vue
@@ -518,7 +518,7 @@ export default {
//库存统计列表
getMaterials(page) {
let that = this;
- that.$API.wpm.wmaterial.list.req({ page: page,page_size:500,mgroup__name__in:'倒角A,倒角B' }).then((res) => {
+ that.$API.wpm.wmaterial.list.req({ page: page,page_size:500,mgroup__name__in:'倒角' }).then((res) => {
if(res.results.length>0){
res.results.forEach((item) => {
let arr = [];
diff --git a/src/views/bigScreen/gxerp/index_duoxianqie.vue b/src/views/bigScreen/gxerp/index_duoxianqie.vue
index 186fb101..0008ad5b 100644
--- a/src/views/bigScreen/gxerp/index_duoxianqie.vue
+++ b/src/views/bigScreen/gxerp/index_duoxianqie.vue
@@ -519,7 +519,7 @@ export default {
//库存统计列表
getMaterials(page) {
let that = this;
- that.$API.wpm.wmaterial.list.req({ page: page,page_size:500,mgroup__name__in:'减薄A,减薄B' }).then((res) => {
+ that.$API.wpm.wmaterial.list.req({ page: page,page_size:500,mgroup__name__in:'多线切' }).then((res) => {
if(res.results.length>0){
res.results.forEach((item) => {
let arr = [];
diff --git a/src/views/bigScreen/gxerp/index_jingdiao.vue b/src/views/bigScreen/gxerp/index_jingdiao.vue
index 8679487c..0d6421f1 100644
--- a/src/views/bigScreen/gxerp/index_jingdiao.vue
+++ b/src/views/bigScreen/gxerp/index_jingdiao.vue
@@ -518,7 +518,7 @@ export default {
//库存统计列表
getMaterials(page) {
let that = this;
- that.$API.wpm.wmaterial.list.req({ page: page,page_size:500,mgroup__name__in:'减薄A,减薄B' }).then((res) => {
+ that.$API.wpm.wmaterial.list.req({ page: page,page_size:500,mgroup__name__in:'精雕' }).then((res) => {
if(res.results.length>0){
res.results.forEach((item) => {
let arr = [];
diff --git a/src/views/bigScreen/gxerp/index_mopao.vue b/src/views/bigScreen/gxerp/index_mopao.vue
index df7dfa3c..38c4a47b 100644
--- a/src/views/bigScreen/gxerp/index_mopao.vue
+++ b/src/views/bigScreen/gxerp/index_mopao.vue
@@ -518,7 +518,7 @@ export default {
//库存统计列表
getMaterials(page) {
let that = this;
- that.$API.wpm.wmaterial.list.req({ page: page,page_size:500,mgroup__name__in:'减薄A,减薄B' }).then((res) => {
+ that.$API.wpm.wmaterial.list.req({ page: page,page_size:500,mgroup__name__in:'白片抛后超洗,平磨,磨抛一次抛,一次抛后超洗,成品抛,一次超洗,二次超洗,三次超洗' }).then((res) => {
if(res.results.length>0){
res.results.forEach((item) => {
let arr = [];
diff --git a/src/views/bigScreen/gxerp/index_saobian.vue b/src/views/bigScreen/gxerp/index_saobian.vue
index 5b18bfa9..e7beefd4 100644
--- a/src/views/bigScreen/gxerp/index_saobian.vue
+++ b/src/views/bigScreen/gxerp/index_saobian.vue
@@ -259,13 +259,6 @@ export default {
data:[],
waitTime:1000,
},
- //交接记录
- configDataHandover:{
- headerBGC:'#0a3f44',
- header:['物料','数量','交接类型','交接类别','交接日期'],
- headerHeight:40,
- data:[]
- },
//设备
configDataEq:{
headerBGC:'#0a3f44',
@@ -312,7 +305,6 @@ export default {
that.daysList.push(dayitem);
})
that.today = new Date().toISOString().split('T')[0]
- // console.log('new Date', new Date().toISOString().split('T'))
this.xAxisData = xAxisData;
let startDate = new Date(daysArr[0]).getTime()-(1000*60*60*24);
let endDate = new Date(daysArr[6]).getTime()+(1000*60*60*24);
@@ -324,19 +316,12 @@ export default {
this.$API.mtm.mgroup.list.req({page:0,belong_dept__name:'扫边车间'}).then((res) => {
that.mgroups = res;
that.configDataEq.data = [];
- that.configDataHandover.data = [];
res.forEach((item)=>{
//设备数据
that.getEqState(item.id);
- //库存统计
- // this.getMaterials(item.id);
- //交接列表
- // this.getHandover(item.id);
})
})
this.getMaterials(that.page);
- //任务进度
- // this.getMtask();
//投产/生产分析
this.getProductLine();
this.getCountnotok();
@@ -530,35 +515,6 @@ export default {
}
});
},
- //交接列表
- getHandover(id) {
- let that = this;
- let obj = {};
- obj.mgroup = id;
- obj.page = 0;
- obj.send_date =
- that.$API.wpm.handover.list.req(obj).then((res) => {
- res.forEach((item) => {
- let arr = [];
- arr[0] = item.material_name;
- arr[1] = item.count;
- arr[2] = item.material_out_.model;
- if(item.state==10){
- arr[3]='正常';
- }else if(item.state==20){
- arr[3]='返工';
- }else if(item.state==30){
- arr[3]='检验';
- }else if(item.state==40){
- arr[3]='报废';
- }
- arr[4] = item.send_user_name;
- arr[5] = item.recive_user_name;
- arr[6] = item.send_date;
- that.configDataHandover.data.push(arr);
- });
- });
- },
//库存统计列表
getMaterials(page) {
let that = this;