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

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

@ -502,7 +502,9 @@
let month = dat.getMonth() + 1;
let searchTime = Year + '-' + month + '-01';
that.numberShow = false;
getContractList({ //合同
let orderTatalCount = 0;
//合同
getContractList({
type: 'big_screen',
page: 1,
page_size: 1,
@ -510,12 +512,13 @@
}).then((response) => {
if (response.data) {
that.titleItem[0].number.number[0] = response.data.count;
//订单
getOrderList({
type: 'big_screen',
page: 1,
page_size: 1,
create_time_start: that.create_time_start
}).then((respons) => {//订单
}).then((respons) => {
if (respons.data) {
that.titleItem[1].number.number[0] = respons.data.count;
getProductionplanList({type: 'big_screen', page: 1, page_size: 1, tag: 'working'}).then((respon) => {
@ -528,7 +531,8 @@
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.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) {
let list = res.data;
let data = [];
@ -545,14 +549,26 @@
debugger;
})*/
//准时交付率
/*getOrderList({type: 'big_screen',page: 1, page_size: that.warningPageSize, tag: 'near_delivery'}).then((response) => {
if (response.data) {
that.warningList = response.data.results;
that.warningTotal = response.data.count;
}
});*/
getOrderList({type: 'big_screen', page: 1, page_size: 1,}).then((res1) => {//总数
if (res1.data) {
orderTatalCount = res1.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;
}
});
}
});
}
})
}
});

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

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