From ca2200ba53b236e8902b706c444375408c782f07 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期一, 18 九月 2023 15:58:45 +0800
Subject: [PATCH] 09-18 小程序
---
minipro_standard/pages_adjust/pages/workOrderReporting/workOrderReporting.vue | 94 +++++++++++++++++++++++++---------------------
1 files changed, 51 insertions(+), 43 deletions(-)
diff --git a/minipro_standard/pages_adjust/pages/workOrderReporting/workOrderReporting.vue b/minipro_standard/pages_adjust/pages/workOrderReporting/workOrderReporting.vue
index 39de708..972c805 100644
--- a/minipro_standard/pages_adjust/pages/workOrderReporting/workOrderReporting.vue
+++ b/minipro_standard/pages_adjust/pages/workOrderReporting/workOrderReporting.vue
@@ -1,4 +1,5 @@
-<template>
+<template>
+ <page-meta :page-style="(badShow||statistics) ?'overflow: hidden;': ''"/>
<view>
<view class="tips-label">褰撳墠浠诲姟闇�瑕佽川妫�锛涗骇鍑哄悗锛岃鑰愬績绛夊緟璐ㄦ鍛樻楠岋紝骞舵牴鎹楠岀粨鏋滆皟鏁翠骇鍑烘暟鎹悗鍐嶆姤宸ャ��</view>
<workOrderInfo :orederMessage="info" />
@@ -124,8 +125,9 @@
:style="{ color: form.durationName ? '#333' : '' }">{{ form.durationName ? form.durationName : '璇烽�夋嫨' }}</span>
<image src="../../../static/ic_ar@2x.png" class="img_ar" mode=""></image>
</div>
- </div>
- <div class="bg_list_item" v-if="form.duration && arrType && arrType.length > 0">
+ </div>
+ <!-- form.duration && -->
+ <div class="bg_list_item" v-if="arrType && arrType.length > 0">
<div class="bg_list_item_top">
<div class="bg_list_item_top_left">
<div class="bg_list_item_top_left_x bg_m"></div>
@@ -175,31 +177,38 @@
</div>
<div class="details_dj" v-if="typeView === 1">
- <div class="details_dj_list">
- <scroll-view scroll-y="true" refresher-enabled="true" @scrolltolower="getLists">
- <u-swipe-action v-for="(item, index) in djData" :key="index">
- <u-swipe-action-item :options="options" @click="dele(item.id)">
- <div class="details_dj_list_item">
- <span>{{ item.attrName }}锛歿{ item.val }}</span>
- <span>{{ item.userName }} {{ item.createTime }}</span>
- </div>
- </u-swipe-action-item>
- </u-swipe-action>
- </scroll-view>
+ <div class="details_dj_list">
+ <u-swipe-action v-for="(item, index) in djData" :key="index">
+ <u-swipe-action-item :options="options" @click="dele(item.id)">
+ <div class="details_dj_list_item">
+ <span>{{ item.attrName }}锛歿{ item.val }}</span>
+ <span>{{ item.userName }} {{ item.createTime }}</span>
+ </div>
+ </u-swipe-action-item>
+ </u-swipe-action>
</div>
</div>
- <!-- v-if="info.status === 2 || info.procedureNeedcheck === 1" -->
- <template v-if="info.status === 2 || info.procedureNeedcheck === 1">
+ <!-- v-if="info.status === 2 || info.procedureNeedcheck === 1" -->
+ <!-- status 0宸插垱寤恒��1宸插鏂欍��2宸插畬宸ャ��3宸叉楠屻��4宸叉姤宸ャ��5宸插叆搴撱��6宸插彇娑堛��7鐢熶骇涓� -->
+ <!-- procedureNeedcheck 宸ュ簭鏄惁闇�瑕佹楠屾墠鑳芥姤宸� 0鏄� 1鍚� -->
+ <template v-if="typeView == 0 &&( info.status === 2 || info.procedureNeedcheck === 1 )">
<div class="bh_zw"></div>
<div class="bg_footer bg_f7">
<div class="bg_footer_submit bg_m" v-if="typeView == 0" @click="submit">纭鎶ュ伐</div>
<!-- proxy.$auth('h5:workorder:processRecord') && -->
+
+ </div>
+ </template>
+ <template v-if="typeView == 1 && info.status !== 4 && info.procedureNeedcheck !== 5 && info.procedureNeedcheck !== 6">
+ <div class="bh_zw"></div>
+ <div class="bg_footer bg_f7">
<div class="bg_footer_submit1" @click="jumpdj" v-if="typeView == 1">
<image src="../../../static/gongdan_ic_shoudong@2x.png" class="fornt-img" mode=""></image>
<span>鏂板鐐规</span>
</div>
</div>
- </template>
+ </template>
+ <u-safe-bottom></u-safe-bottom>
<u-datetime-picker :show="TimeShow" @cancel="TimeShow=false" @confirm="timeConfirm" v-model="form.time"
mode="time"></u-datetime-picker>
<u-popup :show="badShow" @close="badShow=false" :round="8" closeable zIndex="20000">
@@ -375,23 +384,24 @@
return (Number(h) * (this.arrType[this.form.index].salary / 10 / 10)).toFixed(2) || 0
}
},
- complianceRate() {
+ complianceRate() {
+ let { index, duration } = this.form
+ let { qualified, undesirable } = this.produceFrom
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 (!qualified && !undesirable) return 0;
+ if (!duration) return 0;
+ if (!this.arrType[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)
+ if (this.arrType[index].unqualified == 1) { // 鏄惁璁″叆涓嶈壇鍝�
+ let a = ((Number(qualified) + Number(undesirable)) / (duration / 3600)).toFixed(2)
+ let b = (this.arrType[index].num / (this.arrType[index].times / 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)
+ let a = (qualified / (duration / 3600)).toFixed(2)
+ let b = (this.arrType[index].num / (this.arrType[index].times / 3600)).toFixed(2)
return ((Number(a) / Number(b)) * 100).toFixed(2)
// return Number(from.qualified) * infoBox.value.salary;
}
@@ -461,7 +471,6 @@
timeConfirm({
value
}) {
- console.log(value)
let h = Number(value.substring(0, 2))
let m = Number(value.substring(3, 5))
let s = 0
@@ -876,11 +885,11 @@
})
return
}
- total = total += item.num
+ total += Number(item.num)
arr.push(item)
name += item.name + item.num + '锛�'
}
- })
+ })
if (total != Number(this.produceFrom.undesirable)) {
uni.showToast({
title: '涓嶈壇鏁板繀椤荤瓑浜庝骇鍑轰笉鑹暟',
@@ -1048,7 +1057,11 @@
padding: 0 30rpx;
box-sizing: border-box;
background: white;
-
+ &:last-child {
+ .bg_list_item_num{
+ border: none !important;
+ }
+ }
.bg_list_item_num {
width: 100%;
min-height: 98rpx;
@@ -1057,11 +1070,6 @@
justify-content: center;
align-items: center;
border-bottom: 1rpx solid #E5E5E5;
-
- &:last-child {
- border: none !important;
- }
-
.kong {
text-align: center;
font-size: 25rpx;
@@ -1142,9 +1150,9 @@
span {
flex-shrink: 0;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
+ // overflow: hidden;
+ // text-overflow: ellipsis;
+ // white-space: nowrap;
b {
font-size: 30rpx;
@@ -1209,9 +1217,9 @@
.wulll {
width: 400rpx;
text-align: right;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
+ // overflow: hidden;
+ // white-space: nowrap;
+ // text-overflow: ellipsis;
}
span {
@@ -1233,7 +1241,7 @@
padding: 30rpx;
box-sizing: border-box;
background: #FFFFFF;
- margin-bottom: 40rpx;
+ // margin-bottom: 40rpx;
display: flex;
align-items: center;
justify-content: space-between;
--
Gitblit v1.9.3