From 8a8564207b3777893a2797aa6bd7ca9b6d000f3d Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期四, 14 九月 2023 10:16:54 +0800
Subject: [PATCH] 小程序
---
minipro_standard/components/workOrderInfo.vue | 6
minipro_standard/pages_adjust/pages/warehousingDetails1/warehousingDetails1.vue | 1
minipro_standard/pages_adjust/pages/workOrderReporting/workOrderReporting.vue | 35 +++++---
minipro_standard/pages_adjust/pages/warehousingDetails/warehousingDetails.vue | 1
minipro_standard/pages_adjust/pages/OrderDetail/OrderDetail.vue | 127 ++++++++++++++++++-------------
minipro_standard/pages/index/index.vue | 3
minipro_standard/pages_inspect/pages/OutOperation/OutOperation.vue | 2
minipro_standard/pages_adjust/pages/reportingForWork/reportingForWork.vue | 2
minipro_standard/pages_inspect/pages/InOperation/InOperation.vue | 2
minipro_standard/components/LabelSelection.vue | 2
10 files changed, 106 insertions(+), 75 deletions(-)
diff --git a/minipro_standard/components/LabelSelection.vue b/minipro_standard/components/LabelSelection.vue
index 65f8438..67f65ff 100644
--- a/minipro_standard/components/LabelSelection.vue
+++ b/minipro_standard/components/LabelSelection.vue
@@ -71,7 +71,7 @@
}
.tag_item {
min-width: 120rpx;
- padding: 14rpx 24rpx;
+ padding: 14rpx;
border-radius: 26rpx;
text-align: center;
flex-shrink: 0;
diff --git a/minipro_standard/components/workOrderInfo.vue b/minipro_standard/components/workOrderInfo.vue
index 8918151..4777f6b 100644
--- a/minipro_standard/components/workOrderInfo.vue
+++ b/minipro_standard/components/workOrderInfo.vue
@@ -79,7 +79,7 @@
color: #666666;
line-height: 26rpx;
}
-.order-info {
- border-bottom: 20rpx #f7f7f7 solid;
-}
+// .order-info {
+// border-bottom: 20rpx #f7f7f7 solid;
+// }
</style>
diff --git a/minipro_standard/pages/index/index.vue b/minipro_standard/pages/index/index.vue
index 8e9afcd..6d2fd6e 100644
--- a/minipro_standard/pages/index/index.vue
+++ b/minipro_standard/pages/index/index.vue
@@ -194,6 +194,9 @@
success: res => {
this.windowHeight = res.windowHeight
}
+ })
+ uni.$on('success', () => {
+ this.search();
})
this.loadData()
},
diff --git a/minipro_standard/pages_adjust/pages/OrderDetail/OrderDetail.vue b/minipro_standard/pages_adjust/pages/OrderDetail/OrderDetail.vue
index 5b49724..31082f7 100644
--- a/minipro_standard/pages_adjust/pages/OrderDetail/OrderDetail.vue
+++ b/minipro_standard/pages_adjust/pages/OrderDetail/OrderDetail.vue
@@ -1,10 +1,6 @@
<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">
<div class="bg_list_item">
<div class="bg_list_item_top">
@@ -113,6 +109,49 @@
</div>
</template>
</div>
+ <div class="bg_list_item">
+ <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>
+ </div>
+ </div>
+ <div class="bg_list_item_h">
+ <div class="bg_list_item_num">
+ <div class="bg_list_item_num_item">
+ <span>璁′欢鏂瑰紡</span>
+ <div class="bg_list_item_num_item_list">
+ {{ performance.salaryType == 0 ? '璁′欢' : '璁℃椂' }}
+ </div>
+ </div>
+ </div>
+ <div class="bg_list_item_num">
+ <div class="bg_list_item_num_item">
+ <span>宸ヨ祫鍗曚环</span>
+ <div class="bg_list_item_num_item_sr">
+ <span class="color1">{{ (performance.salaryPrice / 10 / 10).toFixed(2) }}鍏�/{{ performance.salaryType ==
+ 0 ? '浠�' : '鏃�' }}</span>
+ </div>
+ </div>
+ </div>
+ <div class="bg_list_item_num">
+ <div class="bg_list_item_num_item">
+ <span>棰勮宸ヨ祫</span>
+ <div class="bg_list_item_num_item_sr">
+ <span class="color1">{{ (performance.salary / 10 / 10).toFixed(2) }}鍏�</span>
+ </div>
+ </div>
+ </div>
+ <div class="bg_list_item_num">
+ <div class="bg_list_item_num_item">
+ <span>杈炬爣鐜�</span>
+ <div class="bg_list_item_num_item_sr">
+ <span class="color1">{{ complianceRate }}%</span>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
</view>
@@ -152,13 +191,6 @@
data() {
return {
workorderId: '',
- cate: [{
- name: '鐢熶骇'
- },
- {
- name: '鐐规'
- }
- ],
form: {
time: '',
efective: [],
@@ -186,17 +218,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 +245,23 @@
})
},
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
+ if (!this.performance) return 0;
+ if (!this.performance.duration) return 0;
+
+ if (!this.performance.qualifiedNum && !this.performance.unqualifiedNum) return 0;
+ if (this.performance.salaryUnqualified == 1) { // 鏄惁璁″叆涓嶈壇鍝�
+ let a = ((Number(this.performance.qualifiedNum) + Number(this.performance.unqualifiedNum)) / (this.performance
.duration / 3600)).toFixed(2)
- let b = (this.arrType[this.form.index].num / (this.arrType[form.index].times / 3600)).toFixed(2)
+ let b = (this.performance.salaryNum / (this.performance.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 = (this.performance.qualifiedNum / (this.performance.duration / 3600)).toFixed(2)
+ // let b = (this.arrType[this.form.index].num / (this.arrType[this.form.index].times / 3600)).toFixed(2)
+ let b = (this.performance.salaryNum / (this.performance.salaryTimes / 3600)).toFixed(2)
return ((Number(a) / Number(b)) * 100).toFixed(2)
- // return Number(from.qualified) * infoBox.value.salary;
}
}
},
@@ -268,7 +287,7 @@
this.pageDJs()
}
},
- getLists() {
+ getLists() {
if (!this.finished) {
return
}
@@ -343,7 +362,7 @@
url: `/pages_inspect/pages/InspectionRecords/InspectionRecords?id=${this.workorderId}`
})
},
- pageDJs() {
+ pageDJs() {
pageDJ({
capacity: this.pages.capacity,
page: this.pages.page,
@@ -427,7 +446,7 @@
},
queryByIds() {
queryById(this.workorderId)
- .then(res => {
+ .then(res => {
this.info = res.data
queryList({
deleted: 0,
@@ -464,10 +483,13 @@
getOrocessRecordCC() {
getWorkorderRecordListStandard({
workorderId: this.workorderId
- }).then(res => {
+ }).then(res => {
+ console.log(res.data[0]);
+ debugger
if (res.data.length > 0) {
this.produceFrom.qualified = res.data[0].qualifiedNum
this.produceFrom.undesirable = res.data[0].unqualifiedNum
+ this.performance = res.data[0]
}
})
},
@@ -512,13 +534,13 @@
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;
@@ -535,9 +557,8 @@
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;
diff --git a/minipro_standard/pages_adjust/pages/reportingForWork/reportingForWork.vue b/minipro_standard/pages_adjust/pages/reportingForWork/reportingForWork.vue
index d3b26f9..d7020d8 100644
--- a/minipro_standard/pages_adjust/pages/reportingForWork/reportingForWork.vue
+++ b/minipro_standard/pages_adjust/pages/reportingForWork/reportingForWork.vue
@@ -1218,7 +1218,7 @@
.bottom-view {
left: 40rpx;
right: 40rpx;
- bottom: 0
+ bottom: 20rpx
}
}
</style>
diff --git a/minipro_standard/pages_adjust/pages/warehousingDetails/warehousingDetails.vue b/minipro_standard/pages_adjust/pages/warehousingDetails/warehousingDetails.vue
index 6b97610..cf66e4c 100644
--- a/minipro_standard/pages_adjust/pages/warehousingDetails/warehousingDetails.vue
+++ b/minipro_standard/pages_adjust/pages/warehousingDetails/warehousingDetails.vue
@@ -256,7 +256,6 @@
};
},
onLoad(option) {
- debugger
this.id = option.id
wTransferExtDetail(option.id)
.then(res => {
diff --git a/minipro_standard/pages_adjust/pages/warehousingDetails1/warehousingDetails1.vue b/minipro_standard/pages_adjust/pages/warehousingDetails1/warehousingDetails1.vue
index 9680dd1..d184e6e 100644
--- a/minipro_standard/pages_adjust/pages/warehousingDetails1/warehousingDetails1.vue
+++ b/minipro_standard/pages_adjust/pages/warehousingDetails1/warehousingDetails1.vue
@@ -158,7 +158,6 @@
};
},
onLoad(option) {
- debugger
this.id = option.id
getBoundDetail({
id: option.id
diff --git a/minipro_standard/pages_adjust/pages/workOrderReporting/workOrderReporting.vue b/minipro_standard/pages_adjust/pages/workOrderReporting/workOrderReporting.vue
index 1cbbb33..39de708 100644
--- a/minipro_standard/pages_adjust/pages/workOrderReporting/workOrderReporting.vue
+++ b/minipro_standard/pages_adjust/pages/workOrderReporting/workOrderReporting.vue
@@ -252,7 +252,7 @@
<div class="tg_footer">
<!-- proxy.$auth('h5:workorderoutput:confirm') && -->
<button class="tg_footer_qr" @click="submitBG" v-if="isSubmit">纭鎶ュ伐</button>
- <div class="tg_footer_fh" @click="gofh" v-else-if="!isSubmit">杩斿洖淇敼</div>
+ <div class="tg_footer_fh" @click="statistics = false" v-else-if="!isSubmit">杩斿洖淇敼</div>
</div>
</div>
</u-popup>
@@ -344,7 +344,8 @@
this.workorderId = obj.id
this.queryByIds()
this.getOrocessRecords()
- this.getData()
+ this.getData()
+ this.pageDJs()
uni.$on('spotAdd', () => {
if (this.typeView == 1) {
this.pages.page = 1
@@ -414,7 +415,8 @@
item.id = item.type
item.active = index == 0
})
- this.arrType = result.data
+ this.arrType = result.data
+
} else {
this.arrType = []
}
@@ -641,8 +643,11 @@
num: this.produceFrom.undesirable
})
this.isSubmit = Number(this.produceFrom.qualified) + Number(this.produceFrom.undesirable) <= this
- .info.planNum;
- }
+ .info.planNum;
+ console.log(this.isSubmit);
+ debugger
+ }
+
} else {
console.log('鎺ㄥ紡')
if (this.feedingData.length === 0) {
@@ -652,7 +657,6 @@
}
if (this.produceFrom.qualified <= 0 && this.produceFrom.undesirable <= 0) {
uni.$u.toast('浜у嚭鏄庣粏涓嶈兘涓虹┖')
-
return
}
this.statisticsData = []
@@ -953,14 +957,14 @@
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;
@@ -975,10 +979,10 @@
.bg_list_item_top {
display: flex;
align-items: center;
- justify-content: space-between;
- padding-left: 30rpx;
- padding-right: 30rpx;
- margin-bottom: 30rpx;
+ justify-content: space-between;
+ background-color: #f7f7f7;
+ padding: 30rpx;
+ // padding-right: 30rpx;
.bg_list_item_top_left {
display: flex;
@@ -1223,7 +1227,8 @@
}
.bg_plan {
- width: 100%;
+ width: 100%;
+ border-top: 20rpx #f7f7f7 solid;
// height: 98px;
padding: 30rpx;
box-sizing: border-box;
@@ -1409,7 +1414,7 @@
.bottom-view {
left: 40rpx;
right: 40rpx;
- bottom: 0
+ bottom: 20rpx
}
.bl_list {
diff --git a/minipro_standard/pages_inspect/pages/InOperation/InOperation.vue b/minipro_standard/pages_inspect/pages/InOperation/InOperation.vue
index 7b6a2eb..e6c7247 100644
--- a/minipro_standard/pages_inspect/pages/InOperation/InOperation.vue
+++ b/minipro_standard/pages_inspect/pages/InOperation/InOperation.vue
@@ -383,6 +383,7 @@
}).then(res => {
if (res.code === 200) {
this.$store.dispatch('getUpcomingNum')
+ uni.$emit('success')
uni.$u.toast('鎿嶄綔鎴愬姛')
if (this.type == '4') { // 璺宠浆瀹屽伐鍏ュ簱璇︽儏
// uni.navigateTo({
@@ -434,6 +435,7 @@
if (res.code === 200) {
this.$store.dispatch('getUpcomingNum')
uni.$u.toast('鎿嶄綔鎴愬姛')
+ uni.$emit('success')
uni.redirectTo({
url: `/pages_adjust/pages/warehousingDetails1/warehousingDetails1?id=${this.id}`
})
diff --git a/minipro_standard/pages_inspect/pages/OutOperation/OutOperation.vue b/minipro_standard/pages_inspect/pages/OutOperation/OutOperation.vue
index cefe4b7..cbe0238 100644
--- a/minipro_standard/pages_inspect/pages/OutOperation/OutOperation.vue
+++ b/minipro_standard/pages_inspect/pages/OutOperation/OutOperation.vue
@@ -352,6 +352,7 @@
if (res.code === 200) {
this.$store.dispatch('getUpcomingNum')
uni.$u.toast('鎿嶄綔鎴愬姛')
+ uni.$emit('success')
uni.redirectTo({
url: `/pages_adjust/pages/warehousingDetails/warehousingDetails?id=${this.id}&dbid=${this.dbid}`
})
@@ -371,6 +372,7 @@
if (res.code === 200) {
this.$store.dispatch('getUpcomingNum')
uni.$u.toast('鎿嶄綔鎴愬姛')
+ uni.$emit('success')
uni.redirectTo({
url: `/pages_adjust/pages/outboundDetails/outboundDetails?id=${this.id}`
})
--
Gitblit v1.9.3