From 4fa0cbae96cde47e4878e16c87da294903a457ae Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 11 九月 2023 17:41:21 +0800
Subject: [PATCH] 同步素材库商品
---
minipro_standard/pages_adjust/pages/reportingForWork/reportingForWork.vue | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/minipro_standard/pages_adjust/pages/reportingForWork/reportingForWork.vue b/minipro_standard/pages_adjust/pages/reportingForWork/reportingForWork.vue
index 04c7879..d3b26f9 100644
--- a/minipro_standard/pages_adjust/pages/reportingForWork/reportingForWork.vue
+++ b/minipro_standard/pages_adjust/pages/reportingForWork/reportingForWork.vue
@@ -2,7 +2,7 @@
<view class="bg">
<view class="bg_plan" @click="selectPlan">
<view class="bg_plan_label" v-if="!from.processPlan">
- <text><b>*</b>宸ュ簭鐢熶骇璁″垝</text>
+ <text><text>*</text>宸ュ簭鐢熶骇璁″垝</text>
</view>
<view class="bg_plan_nr" v-else>
<text>{{ from.processPlan.materialName }} | {{ from.processPlan.materialCode }} | {{ from.processPlan.produceName }}</text>
@@ -109,7 +109,7 @@
<view class="bg_list_item_h">
<view class="bg_list_item_num">
<view class="bg_list_item_num_item">
- <text><b>*</b>鑹搧鏁�</text>
+ <text><text>*</text>鑹搧鏁�</text>
<view class="bg_list_item_num_item_sr">
<u--input
placeholder="璇疯緭鍏�"
@@ -143,7 +143,8 @@
</view>
<view class="bg_list_item_num" v-if="from.undesirable > 0">
<view class="bg_list_item_num_item" @click="openBL">
- <text><b>*</b>涓嶈壇椤�</text>
+ <!-- <text>*</text> -->
+ <text>涓嶈壇椤�</text>
<view class="bg_list_item_num_item_sr">
<text class="wulll" :style="{color: from.defectiveName ? '#305ED5' : ''}">{{from.defectiveName ? from.defectiveName : '璁剧疆'}}</text>
<image src="@/static/ic_ar@2x.png" alt="" />
@@ -161,7 +162,7 @@
<image src="@/static/ic_ar@2x.png" alt="" />
</view>
</view>
- <view class="bg_list_item" v-if="arrType && arrType.length > 0">
+ <view class="bg_list_item" v-if="arrType && arrType.length > 0 && from.duration > 0">
<view class="bg_list_item_top">
<view class="bg_list_item_top_left">
<view class="bg_list_item_top_left_x"></view>
@@ -258,9 +259,9 @@
processPlan: null,
deviceId: '',
deviceName: '',
- // userId: store.state.userInfo.id,
+ // userId: userInfo.id,
userId: '',
- // userName: store.state.userInfo.companyUser.name,
+ // userName: userInfo.companyUser.name,
userName: '',
qualified: '', // 鑹搧鏁�
undesirable: '', // 涓嶈壇鏁�
@@ -333,8 +334,13 @@
}
},
onReady() {
- this.from.userId = this.userInfo.id
- this.form.userName = this.userInfo.realname
+ let timer = setInterval(() => {
+ if (this.userInfo) {
+ this.from.userId = this.userInfo.id
+ this.from.userName = this.userInfo.realname
+ clearInterval(timer)
+ }
+ }, 500)
},
onLoad() {
let arr = []
@@ -722,7 +728,7 @@
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #222222;
- b {
+ text {
color: red;
}
}
@@ -932,9 +938,9 @@
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
- b {
+ text {
font-size: 30rpx;
- color: red;
+ color: red !important;
margin-right: 5rpx;
}
.warning {
--
Gitblit v1.9.3