zcdsj
/
hberp
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop

This commit is contained in:
caoqianming 2022-03-24 08:48:25 +08:00
parent d1fe27db0e c0d96cb735
commit 2a02b63955
2 changed files with 59 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
hb_client/src/views/bigScreen/index.vue
View File

@ -126,7 +126,7 @@
import bottomRight from './bottomRight' import bottomRight from './bottomRight'
import {getPlanGantt} from "@/api/srm"; import {getPlanGantt} from "@/api/srm";
import {getProductionplanList} from "@/api/pm"; import {getProductionplanList} from "@/api/pm";
import {getProcessYield,productCount,getProcessNow,planCount,orderCount} from "@/api/srm"; import {getProcessYield, productCount, getProcessNow, planCount, orderCount} from "@/api/srm";
import {getContractList, getOrderList} from "@/api/sam"; import {getContractList, getOrderList} from "@/api/sam";
import {getArticles} from "@/api/cms"; import {getArticles} from "@/api/cms";
@ -359,7 +359,7 @@
}, },
], ],
limitedOne:false, limitedOne: false,
//车间二 //车间二
numberDataTwo: [ numberDataTwo: [
{ {
@ -412,9 +412,9 @@
}, },
], ],
limitedTwo:false, limitedTwo: false,
configArticle: { configArticle: {
header: ['标题','置顶','作者', '发布时间'], header: ['标题', '置顶', '作者', '发布时间'],
data: [ data: [
['郑成功', '2022-03-05'], ['郑成功', '2022-03-05'],
['冯宝宝', '2022-03-05'] ['冯宝宝', '2022-03-05']
@ -502,7 +502,9 @@
let month = dat.getMonth() + 1; let month = dat.getMonth() + 1;
let searchTime = Year + '-' + month + '-01'; let searchTime = Year + '-' + month + '-01';
that.numberShow = false; that.numberShow = false;
getContractList({ //合同 let orderTatalCount = 0;
//合同
getContractList({
type: 'big_screen', type: 'big_screen',
page: 1, page: 1,
page_size: 1, page_size: 1,
@ -510,48 +512,62 @@
}).then((response) => { }).then((response) => {
if (response.data) { if (response.data) {
that.titleItem[0].number.number[0] = response.data.count; that.titleItem[0].number.number[0] = response.data.count;
//订单
getOrderList({ getOrderList({
type: 'big_screen', type: 'big_screen',
page: 1, page: 1,
page_size: 1, page_size: 1,
create_time_start: that.create_time_start create_time_start: that.create_time_start
}).then((respons) => {//订单 }).then((respons) => {
if (respons.data) { if (respons.data) {
that.titleItem[1].number.number[0] = respons.data.count; that.titleItem[1].number.number[0] = respons.data.count;
getProductionplanList({type: 'big_screen', page: 1, page_size: 1, tag: 'working'}).then((respon) => { getProductionplanList({type: 'big_screen', page: 1, page_size: 1, tag: 'working'}).then((respon) => {
if (respon.data) { if (respon.data) {
that.titleItem[2].number.number[0] = respon.data.count; that.titleItem[2].number.number[0] = respon.data.count;
productCount({type: 'big_screen',datetime_start:searchTime,tag:1}).then(respo=>{ productCount({type: 'big_screen', datetime_start: searchTime, tag: 1}).then(respo => {
if (respo.data) { if (respo.data) {
that.titleItem[3].number.number[0] = respo.data.count_selled; that.titleItem[3].number.number[0] = respo.data.count_selled;
that.titleItem[4].number.number[0] = respo.data.count_notok; that.titleItem[4].number.number[0] = respo.data.count_notok;
let mtestCount = respo.data.count_mtestok + respo.data.count_mtestnotok; let mtestCount = respo.data.count_mtestok + respo.data.count_mtestnotok;
that.titleItem[5].number.number[0] = Math.floor((respo.data.count_mtestok/mtestCount)*100); that.titleItem[5].number.number[0] = Math.floor((respo.data.count_mtestok / mtestCount) * 100);
that.rate[0].tips = Math.floor((respo.data.count_ok/respo.data.count)*100); that.rate[0].tips = Math.floor((respo.data.count_ok / respo.data.count) * 100);
getProcessNow({type: 'big_screen'}).then(res=>{//工序生产进度 //工序生产进度
getProcessNow({type: 'big_screen'}).then(res => {
if (res.data) { if (res.data) {
let list = res.data; let list = res.data;
let data = []; let data = [];
list.forEach(item => { list.forEach(item => {
let obj = new Object(); let obj = new Object();
obj.name = item.process__name; obj.name = item.process__name;
let value = Math.floor(item.count/item.count_real * 100); let value = Math.floor(item.count / item.count_real * 100);
obj.value = value>100?100:value; obj.value = value > 100 ? 100 : value;
data.push(obj) data.push(obj)
}); });
that.ranking.data = data; that.ranking.data = data;
//任务完成率 //任务完成率
/* planCount({type: 'big_screen'}).then(res=>{ /* planCount({type: 'big_screen'}).then(res=>{
debugger; debugger;
})*/ })*/
//准时交付率 //准时交付率
/*getOrderList({type: 'big_screen',page: 1, page_size: that.warningPageSize, tag: 'near_delivery'}).then((response) => { getOrderList({type: 'big_screen', page: 1, page_size: 1,}).then((res1) => {//总数
if (response.data) { if (res1.data) {
that.warningList = response.data.results; orderTatalCount = res1.data.count;
that.warningTotal = response.data.count; getOrderList({
type: 'big_screen',
page: 1,
page_size: 1,
tag: 'out_delivery'
}).then((res2) => {//逾期
if (res2.data) {
let count = res2.data.count;
that.water.data = [];
that.water.data.push((100- count/orderTatalCount*100).toFixed(2));
that.water.data.push((100- count/orderTatalCount*100).toFixed(2));
that.numberShow = true;
}
});
} }
});*/ });
that.numberShow = true;
} }
}) })
} }
@ -571,7 +587,7 @@
let month = dat.getMonth() + 1; let month = dat.getMonth() + 1;
let day = dat.getDate(); let day = dat.getDate();
let searchTime = Year + '-' + month + '-' + day; let searchTime = Year + '-' + month + '-' + day;
getProcessYield({datetime_start: searchTime, datetime_end: searchTime,type:'big_screen'}).then((response) => { getProcessYield({datetime_start: searchTime, datetime_end: searchTime, type: 'big_screen'}).then((response) => {
if (response.data) { if (response.data) {
let list = response.data; let list = response.data;
let data = []; let data = [];
@ -588,7 +604,7 @@
}); });
}, },
//一车间 //一车间
getOneData(){ getOneData() {
let that = this; let that = this;
that.limitedOne = false; that.limitedOne = false;
let dat = new Date(); let dat = new Date();
@ -596,12 +612,12 @@
let month = dat.getMonth() + 1; let month = dat.getMonth() + 1;
let searchTime = Year + '-' + month + '-01'; let searchTime = Year + '-' + month + '-01';
let searchYear = Year + '-' + '01-01'; let searchYear = Year + '-' + '01-01';
productCount({type: 'big_screen',datetime_start:searchTime,tag:2,dept:1}).then(response=>{ productCount({type: 'big_screen', datetime_start: searchTime, tag: 2, dept: 1}).then(response => {
if (response.data) { if (response.data) {
that.numberData[0].number.number[0] = response.data.count; that.numberData[0].number.number[0] = response.data.count;
that.numberData[2].number.number[0] = response.data.count_doing; that.numberData[2].number.number[0] = response.data.count_doing;
that.numberData[3].number.number[0] = response.data.count_notok; that.numberData[3].number.number[0] = response.data.count_notok;
productCount({type: 'big_screen',datetime_start:searchYear,tag:2,dept:1}).then(res=>{ productCount({type: 'big_screen', datetime_start: searchYear, tag: 2, dept: 1}).then(res => {
if (res.data) { if (res.data) {
that.numberData[1].number.number[0] = res.data.count; that.numberData[1].number.number[0] = res.data.count;
that.limitedOne = true; that.limitedOne = true;
@ -611,7 +627,7 @@
}); });
}, },
//二车间 //二车间
getTwoData(){ getTwoData() {
let that = this; let that = this;
that.limitedTwo = false; that.limitedTwo = false;
let dat = new Date(); let dat = new Date();
@ -619,12 +635,12 @@
let month = dat.getMonth() + 1; let month = dat.getMonth() + 1;
let searchTime = Year + '-' + month + '-01'; let searchTime = Year + '-' + month + '-01';
let searchYear = Year + '-' + '01-01'; let searchYear = Year + '-' + '01-01';
productCount({type: 'big_screen',datetime_start:searchTime,tag:2,dept:2}).then(response=>{ productCount({type: 'big_screen', datetime_start: searchTime, tag: 2, dept: 2}).then(response => {
if (response.data) { if (response.data) {
that.numberDataTwo[0].number.number[0] = response.data.count; that.numberDataTwo[0].number.number[0] = response.data.count;
that.numberDataTwo[2].number.number[0] = response.data.count_doing; that.numberDataTwo[2].number.number[0] = response.data.count_doing;
that.numberDataTwo[3].number.number[0] = response.data.count_notok; that.numberDataTwo[3].number.number[0] = response.data.count_notok;
productCount({type: 'big_screen',datetime_start:searchYear,tag:2,dept:2}).then(res=>{ productCount({type: 'big_screen', datetime_start: searchYear, tag: 2, dept: 2}).then(res => {
if (res.data) { if (res.data) {
that.numberDataTwo[1].number.number[0] = res.data.count; that.numberDataTwo[1].number.number[0] = res.data.count;
that.limitedTwo = true; that.limitedTwo = true;
@ -658,26 +674,26 @@
}); });
}, },
//企业资讯 //企业资讯
getArticle(){ getArticle() {
let that = this; let that = this;
getArticles({type: 'big_screen',page:0}).then((response) => { getArticles({type: 'big_screen', page: 0}).then((response) => {
if (response.data) { if (response.data) {
// this.configArticle = response.data; // this.configArticle = response.data;
let list = response.data; let list = response.data;
let data=[]; let data = [];
list.forEach(item => { list.forEach(item => {
let obj = []; let obj = [];
obj.push(item.title); obj.push(item.title);
if(item.is_top===false){ if (item.is_top === false) {
obj.push('未置顶'); obj.push('未置顶');
}else{ } else {
obj.push('已置顶'); obj.push('已置顶');
} }
obj.push(item.author); obj.push(item.author);
obj.push(item.create_time); obj.push(item.create_time);
data.push(obj) data.push(obj)
}); });
that.configArticle.data=data; that.configArticle.data = data;
} }
}); });
}, },

15
hb_client/src/views/dashboard/index.vue
View File

@ -268,7 +268,7 @@
<el-tab-pane label="库存警告" name="库存警告"> <el-tab-pane label="库存警告" name="库存警告">
<ul :style="{height:cardTabelHeight-47+'px'}" class="lists" :class="{anim:animate}" @mouseenter="Stop()" <ul :style="{height:cardTabelHeight-47+'px'}" class="lists" :class="{anim:animate}" @mouseenter="Stop()"
@mouseleave="Up()"> @mouseleave="Up()">
<li class="listItem" v-for="(item,$index) in warningList" :key="$index"> <li class="listItem nearStatus" v-for="(item,$index) in warningList" :key="$index">
<div class="itemText"> <div class="itemText">
<span>{{item.name}}({{item.unit}})</span><span>低于安全库存</span> <span>{{item.name}}({{item.unit}})</span><span>低于安全库存</span>
</div> </div>
@ -278,9 +278,9 @@
<el-tab-pane label="临近交货" name="临近交货"> <el-tab-pane label="临近交货" name="临近交货">
<ul :style="{height:cardTabelHeight-47+'px'}" class="lists" :class="{anim:animate}" @mouseenter="Stop()" <ul :style="{height:cardTabelHeight-47+'px'}" class="lists" :class="{anim:animate}" @mouseenter="Stop()"
@mouseleave="Up()"> @mouseleave="Up()">
<li class="listItem" v-for="(item,$index) in warningList" :key="$index"> <li class="listItem nearStatus" v-for="(item,$index) in warningList" :key="$index">
<div class="itemText"> <div class="itemText">
<span>{{item.name}}({{item.number}})</span><span>{{item.delivery_date}}为交货日期</span> <span>{{item.number}}</span><span>接近交货日期</span>
</div> </div>
</li> </li>
</ul> </ul>
@ -288,9 +288,9 @@
<el-tab-pane label="过期提醒" name="过期提醒"> <el-tab-pane label="过期提醒" name="过期提醒">
<ul :style="{height:cardTabelHeight-47+'px'}" class="lists" :class="{anim:animate}" @mouseenter="Stop()" <ul :style="{height:cardTabelHeight-47+'px'}" class="lists" :class="{anim:animate}" @mouseenter="Stop()"
@mouseleave="Up()"> @mouseleave="Up()">
<li class="listItem" v-for="(item,$index) in warningList" :key="$index"> <li class="listItem outStatus" v-for="(item,$index) in warningList" :key="$index">
<div class="itemText"> <div class="itemText">
<span>{{item.name}}({{item.unit}})</span><span>{{item.expiration_date}}到期</span> <span>{{item.name}}({{item.unit}})</span><span>已过期</span>
</div> </div>
</li> </li>
</ul> </ul>
@ -315,8 +315,8 @@
:class="{nearStatus:item.warningType===1,outStatus:item.warningType===2}"> :class="{nearStatus:item.warningType===1,outStatus:item.warningType===2}">
<div class="itemText"> <div class="itemText">
<span>{{item.name}}{{item.number}}</span> <span>{{item.name}}{{item.number}}</span>
<span v-if="item.warningType===1">接近计划日期</span> <span v-if="item.warningType===1">接近任务截止日期</span>
<span v-else>已过计划日期</span> <span v-else>已过任务截止日期</span>
</div> </div>
</li> </li>
</ul> </ul>
@ -804,6 +804,7 @@
let obj = new Object(); let obj = new Object();
obj.name = item.material_.name; obj.name = item.material_.name;
obj.unit = item.material_.unit; obj.unit = item.material_.unit;
obj.number = item.material_.number;
obj.id = item.id; obj.id = item.id;
obj.expiration_date = item.expiration_date; obj.expiration_date = item.expiration_date;
arr.push(obj) arr.push(obj)