From 349bcef9a96391d22522a3409adf5a89e7e70a95 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 24 十月 2023 08:46:11 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/dmMes into dev
---
minipro_standard/pages_adjust/pages/OrderDetail/OrderDetail.vue | 221 +++++++++++++++++++++++++++++--------------------------
1 files changed, 116 insertions(+), 105 deletions(-)
diff --git a/minipro_standard/pages_adjust/pages/OrderDetail/OrderDetail.vue b/minipro_standard/pages_adjust/pages/OrderDetail/OrderDetail.vue
index 5b49724..d1fbfa3 100644
--- a/minipro_standard/pages_adjust/pages/OrderDetail/OrderDetail.vue
+++ b/minipro_standard/pages_adjust/pages/OrderDetail/OrderDetail.vue
@@ -1,11 +1,11 @@
<template>
- <view>
- <workOrderInfo :orederMessage="info" />
- <!-- <view class="bg_cate">
- <view @click="clickIten(index)" :class="typeView == index ? 'bg_cate_item active' : 'bg_cate_item'"
- v-for="(item, index) in cate" :key="index">{{ item.name }}</view>
- </view> -->
- <div class="bg_list">
+ <view class="content">
+ <workOrderInfo :orederMessage="info" />
+ <view class="bg_cate">
+ <view @click="clickIten(index)" :class="typeView == index ? 'bg_cate_item active' : 'bg_cate_item'"
+ v-for="(item, index) in cate" :key="index">{{ item.name }}</view>
+ </view>
+ <div v-if="typeView==0" class="bg_list">
<div class="bg_list_item">
<div class="bg_list_item_top">
<div class="bg_list_item_top_left">
@@ -15,26 +15,26 @@
</div>
<template v-if="feedingData && feedingData.length > 0">
- <view>
- <view v-for="(item, index) in feedingData" :key="index">
- <div class="bg_list_item_h">
+ <view class="plr30 bg_w">
+ <view >
+ <div v-for="(item, index) in feedingData" :key="index" class="bg_list_item_h">
<div class="bg_list_item_num">
<div class="bg_list_item_num_item">
<div class="bg_list_item_num_item_wl">
<span> {{ item.materialName || '澧欎綋鐮�' }}{{ item.procedureName ? ` | ${item.procedureName}` : ''
}}</span>
<div class="bg_list_item_num_item_wl_lx">
- <span class="green" v-if="item.qualityType == 0">鍚堟牸 / </span>
- <span class="orange" v-if="item.qualityType == 1">涓嶈壇 / </span>
- <span class="red" v-if="item.qualityType == 2">鎶ュ簾 / </span>
+ <span class="green" v-if="item.qualityType == 0">鍚堟牸<text class="c6" decode>{{ split }}</text></span>
+ <span class="orange" v-if="item.qualityType == 1">涓嶈壇<text class="c6" decode>{{ split }}</text></span>
+ <span class="red" v-if="item.qualityType == 2">鎶ュ簾<text class="c6" decode>{{ split }}</text></span>
<span>{{ item.locationName }}</span>
- <span>{{ item.batch ? ` / ${item.batch}` : '' }}</span>
+ <span v-if="item.batch"><text class="c6" decode>{{ split }}</text>{{ item.batch }}</span>
</div>
</div>
<div class="bg_list_item_num_item_sr">
<view class="cY">
<view class="mr10">{{ item.num }}</view>
- <span v-if="info.umodel">{{ info.umodel.name }}</span>
+ <span>{{ item.unitName }}</span>
</view>
</div>
@@ -63,7 +63,7 @@
</div>
</div>
<div class="bg_list_item_h">
- <div class="bg_list_item_num">
+ <div class="bg_list_item_num plr30">
<div class="bg_list_item_num_item">
<span>鑹搧鏁皗{ info.umodel ? `(${info.umodel.name})` : '' }}</span>
<div class="bg_list_item_num_item_sr">
@@ -74,7 +74,7 @@
</div>
</div>
<div class="bg_list_item_h">
- <div class="bg_list_item_num">
+ <div class="bg_list_item_num plr30">
<div class="bg_list_item_num_item">
<span>涓嶈壇鏁皗{ info.umodel ? `(${info.umodel.name})` : '' }}</span>
<div class="bg_list_item_num_item_sr">
@@ -89,21 +89,38 @@
<div class="bg_list_item_top">
<div class="bg_list_item_top_left">
<div class="bg_list_item_top_left_x bg_m"></div>
- <span>鐢熶骇鐐规</span>
+ <span>宸ヨ祫缁╂晥</span>
</div>
</div>
+ <div class="bg_list_item_h mb40 ">
+ <div class="bg_list_item_num plr30" style="display: block;">
+ <div class="bX ptb15">
+ <div class="f30 c2">棰勮宸ヨ祫</div>
+ <div class="f28" style="color:#4275FC">{{ (performance.salary / 10 / 10).toFixed(2) }}鍏�</div>
+ </div>
+ <div class="f24 c6">
+ {{ performance.salaryType == 0 ? '璁′欢' : '璁℃椂' }} |
+ {{ (performance.salaryPrice / 10 / 10).toFixed(2) }}鍏�/{{ performance.salaryType ==
+ 0 ? '浠�' : '鏃�' }} |
+ 杈炬爣鐜囷細{{ complianceRate }}%
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div v-else class="bg_list">
<template v-if="djData && djData.length > 0">
<div class="details_dj">
-
<div class="details_dj_list">
- <scroll-view scroll-y="true" refresher-enabled="true" @scrolltolower="getLists">
- <view v-for="(item, index) in djData" :key="index">
- <div class="details_dj_list_item">
- <span>{{ item.attrName }}锛歿{ item.val }}</span>
- <span>{{ item.userName }} {{ item.createTime }}</span>
- </div>
- </view>
- </scroll-view>
+ <view v-for="(item, index) in djData" :key="index">
+ <div class="details_dj_list_item">
+ <span>{{ item.attrName }}锛歿{ item.val }}</span>
+ <span>{{ item.userName }} {{ item.createTime }}</span>
+ </div>
+ </view>
+ <!-- <scroll-view scroll-y="true" refresher-enabled="true" @scrolltolower="getLists">
+
+ </scroll-view> -->
</div>
</div>
</template>
@@ -113,7 +130,7 @@
</div>
</template>
</div>
- </div>
+ </div>
</view>
</template>
@@ -150,15 +167,16 @@
workOrderInfo
},
data() {
- return {
+ return {
+ cate: [{
+ name: '鐢熶骇'
+ },
+ {
+ name: '鐐规'
+ }
+ ],
+ split: ' / ',
workorderId: '',
- cate: [{
- name: '鐢熶骇'
- },
- {
- name: '鐐规'
- }
- ],
form: {
time: '',
efective: [],
@@ -186,17 +204,24 @@
qualified: '', // 鍚堟牸
undesirableId: '',
undesirable: 5 // 涓嶈壇
+ },
+ pages: {
+ capacity: 10,
+ page: 1,
+ total: 0
},
djData: [],
cateList: [],
- finished: true,
+ finished: true,
+ performance: {}
};
},
onLoad(obj) {
this.workorderId = obj.id
this.queryByIds()
this.getOrocessRecords()
- this.getData()
+ this.getData()
+ this.pageDJs()
this.getOrocessRecordCC()
uni.$on('spotAdd', () => {
if (this.typeView == 1) {
@@ -206,43 +231,24 @@
})
},
computed: {
- expectedSalary() {
- if (this.arrType.length === 0) return 0;
- // 鎸変欢璁＄畻
- if (this.arrType[this.form.index].type == 0) {
- if (!this.produceFrom.qualified) return 0
- if (this.arrType[this.form.index].unqualified == 1) { // 鏄惁璁″叆涓嶈壇鍝�
- let total = Number(this.produceFrom.qualified) + Number(this.produceFrom.undesirable)
- return (total * (this.arrType[this.form.index].salary / 100)).toFixed(2) || 0
- } else {
- return (Number(this.produceFrom.qualified) * (this.arrType[this.form.index].salary / 100)).toFixed(
- 2) || 0
- }
- } else {
- if (!this.form.duration) return 0;
- let h = (this.form.duration / 60 / 60).toFixed(2)
- return (Number(h) * (this.arrType[this.form.index].salary / 10 / 10)).toFixed(2) || 0
- }
- },
- complianceRate() {
- if (this.arrType.length === 0) return 0;
- if (!this.produceFrom.qualified && !this.produceFrom.undesirable) return 0;
- if (!this.form.duration) return 0;
- if (!this.arrType[this.form.index].num) return 0;
- // 鎸変欢璁＄畻
- // if (infoBox.value.type == 0) {
- if (this.arrType[this.form.index].unqualified == 1) { // 鏄惁璁″叆涓嶈壇鍝�
- let a = ((Number(this.produceFrom.qualified) + Number(this.produceFrom.undesirable)) / (this.form
- .duration / 3600)).toFixed(2)
- let b = (this.arrType[this.form.index].num / (this.arrType[form.index].times / 3600)).toFixed(2)
+ complianceRate() {
+ if (!this.performance) return 0;
+ let {duration, salaryNum, salaryTimes, qualifiedNum, unqualifiedNum, salaryUnqualified} = this.performance
+ // 鎶ュ伐鏃堕暱
+ if (!duration) return 0;
+ // 鎶ュ伐鏁伴噺
+ if (!qualifiedNum && !unqualifiedNum) return 0;
+ // 鏍囧噯鏁伴噺銆佹椂闀�
+ if (!salaryNum || !salaryTimes) return 0
+
+ if (salaryUnqualified == 1) { // 鏄惁璁″叆涓嶈壇鍝�
+ let a = ((Number(qualifiedNum) + Number(unqualifiedNum)) / (duration / 3600)).toFixed(2)
+ let b = (salaryNum / (salaryTimes / 3600)).toFixed(2)
return ((Number(a) / Number(b)) * 100).toFixed(2)
- // let total = (Number(from.qualified) + Number(from.undesirable)) / ((from.duration * 60 * 60) * infoBox.value.num / )
- // return total * infoBox.value.salary;
- } else {
- let a = (this.produceFrom.qualified / (this.form.duration / 3600)).toFixed(2)
- let b = (this.arrType[this.form.index].num / (this.arrType[this.form.index].times / 3600)).toFixed(2)
+ } else {
+ let a = (qualifiedNum / (duration / 3600)).toFixed(2)
+ let b = (salaryNum / (salaryTimes / 3600)).toFixed(2)
return ((Number(a) / Number(b)) * 100).toFixed(2)
- // return Number(from.qualified) * infoBox.value.salary;
}
}
},
@@ -268,7 +274,7 @@
this.pageDJs()
}
},
- getLists() {
+ getLists() {
if (!this.finished) {
return
}
@@ -343,7 +349,7 @@
url: `/pages_inspect/pages/InspectionRecords/InspectionRecords?id=${this.workorderId}`
})
},
- pageDJs() {
+ pageDJs() {
pageDJ({
capacity: this.pages.capacity,
page: this.pages.page,
@@ -427,7 +433,7 @@
},
queryByIds() {
queryById(this.workorderId)
- .then(res => {
+ .then(res => {
this.info = res.data
queryList({
deleted: 0,
@@ -464,10 +470,13 @@
getOrocessRecordCC() {
getWorkorderRecordListStandard({
workorderId: this.workorderId
- }).then(res => {
+ }).then(res => {
+ debugger
+ // console.log(res.data[0]);
if (res.data.length > 0) {
this.produceFrom.qualified = res.data[0].qualifiedNum
this.produceFrom.undesirable = res.data[0].unqualifiedNum
+ this.performance = res.data[0]
}
})
},
@@ -481,14 +490,18 @@
}
</script>
-<style lang="scss" scoped>
+<style lang="scss" scoped>
+ .content {
+ height: 100vh;
+ background-color: #f7f7f7;
+ }
.bg_cate {
width: 100%;
height: 88rpx;
background: #FFFFFF;
display: flex;
align-items: center;
-
+ // border-top: 20rpx solid #f7f7f7;
.active {
box-sizing: border-box;
color: #305ED5 !important;
@@ -512,32 +525,22 @@
width: 100%;
display: flex;
flex-direction: column;
- margin-top: 30rpx;
+ // margin-top: 30rpx;
.bg_list_item {
display: flex;
flex-direction: column;
// margin-bottom: 40rpx;
- border-bottom: 40rpx #f7f7f7 solid;
+ // border-bottom: 40rpx #f7f7f7 solid;
- .kong {
- text-align: center;
- padding: 30rpx 0;
- background: #ffffff;
- font-size: 25rpx;
-
- span {
- color: #474747;
- }
- }
+
.bg_list_item_top {
display: flex;
align-items: center;
justify-content: space-between;
- padding-left: 30rpx;
- padding-right: 30rpx;
- margin-bottom: 30rpx;
+ padding: 30rpx;
+ background-color: #f7f7f7;
.bg_list_item_top_left {
display: flex;
@@ -600,23 +603,21 @@
.bg_list_item_h {
width: 100%;
- padding: 0 30rpx;
box-sizing: border-box;
background: white;
-
+ border-bottom: 1rpx solid #E5E5E5;
+ padding: 15rpx 0;
+ &:last-child {
+ border: none !important;
+ }
.bg_list_item_num {
width: 100%;
min-height: 98rpx;
- background: white;
+ background: white;
+ box-sizing: border-box;
display: flex;
justify-content: center;
align-items: center;
- border-bottom: 1rpx solid #E5E5E5;
-
- &:last-child {
- border: none !important;
- }
-
.kong {
text-align: center;
font-size: 25rpx;
@@ -630,10 +631,10 @@
display: flex;
align-items: center;
// height: 118rpx;
- padding: 15rpx 0;
+ // padding: 15rpx 0;
box-sizing: border-box;
justify-content: space-between;
- border-bottom: 1rpx solid #E5E5E5;
+ // border-bottom: 3rpx solid #111;
&:last-child {
border: none;
@@ -1033,5 +1034,15 @@
}
}
}
+ }
+ .kong {
+ text-align: center;
+ padding: 30rpx 0;
+ // background: #ffffff;
+ font-size: 25rpx;
+
+ span {
+ color: #474747;
+ }
}
</style>
--
Gitblit v1.9.3