|
|
@@ -21,6 +21,10 @@
|
|
|
<view class="label">辅助工序</view>
|
|
|
<view class="value">{{ auxiliaryDayworkItem.auxiliaryProcess.name }}</view>
|
|
|
</view>
|
|
|
+ <view class="info-row uni-row">
|
|
|
+ <view class="label">投产数量</view>
|
|
|
+ <view class="value">{{ auxiliaryDayworkItem.prodNum }}</view>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
|
|
|
<!-- 废品信息 -->
|
|
|
@@ -64,10 +68,10 @@
|
|
|
<view class="value">{{ item.dayworkItem.endTime }}</view>
|
|
|
</view>
|
|
|
<view class="resu uni-row">
|
|
|
- <view :class="!editable() ? 'label' : ''">投产数量</view>
|
|
|
- <view class="number value">{{ item.prodNum }}</view>
|
|
|
+ <!-- <view :class="!editable() ? 'label' : ''">投产数量</view>
|
|
|
+ <view class="number value">{{ item.prodNum }}</view> -->
|
|
|
<view :class="!editable() ? 'label' : ''">合格数量</view>
|
|
|
- <view class="value">{{ item.qualificationNum }}</view>
|
|
|
+ <view class="value">{{ item.qualifiedNum }}</view>
|
|
|
<view :class="!editable() ? 'label' : ''">废品量</view>
|
|
|
<input v-if="editable()" class="number" type="number" @blur="rejectNumberChange"
|
|
|
v-model="item.rejectNum" placeholder="" />
|
|
|
@@ -76,10 +80,17 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<!-- 报工部分 -->
|
|
|
- <view class="daywork-container">
|
|
|
+ <view class="daywork-container uni-column unfit-item-container">
|
|
|
<view class="result uni-row">
|
|
|
<view class="label">废品总数</view>
|
|
|
<view class="value" style="margin-left: 10px;">{{ auxiliaryDayworkItem.rejectNum }}</view>
|
|
|
+
|
|
|
+ </view>
|
|
|
+ <view class="half-result uni-row">
|
|
|
+ <view class="label">合格数量</view>
|
|
|
+ <input v-if="editable()" class="number" type="number" v-model="auxiliaryDayworkItem.qualifiedNum"
|
|
|
+ placeholder="" style="width: 140rpx" />
|
|
|
+ <view v-else class="value">{{ auxiliaryDayworkItem.qualifiedNum }}</view>
|
|
|
</view>
|
|
|
<view class="remark uni-row">
|
|
|
<view class="label">备注</view>
|
|
|
@@ -134,15 +145,17 @@
|
|
|
})
|
|
|
const initStatus = ref(0)
|
|
|
const editable = () => {
|
|
|
- if (store.userInfo.permissions.some(item => item === 'business:outsourcedInspection:edit')) {
|
|
|
- return true
|
|
|
- }
|
|
|
- if (initStatus.value == 0) {
|
|
|
- return true
|
|
|
- }
|
|
|
- if (auxiliaryDayworkItem.value.firstUpdaterId == store.userInfo.userId) {
|
|
|
- return true
|
|
|
+ // if (store.userInfo.permissions.some(item => item === 'business:outsourcedInspection:edit')) {
|
|
|
+ // return true
|
|
|
+ // }
|
|
|
+ if (initStatus.value == 0 || initStatus.value == 1) {
|
|
|
+ if (auxiliaryDayworkItem.value.creatorId == store.userInfo.userId) {
|
|
|
+ return true
|
|
|
+ }
|
|
|
}
|
|
|
+ // if (auxiliaryDayworkItem.value.firstUpdaterId == store.userInfo.userId) {
|
|
|
+ // return true
|
|
|
+ // }
|
|
|
return false
|
|
|
}
|
|
|
|
|
|
@@ -250,6 +263,7 @@
|
|
|
sumReject += (v.rejectNum != null ? Number(v.rejectNum) : 0)
|
|
|
sumDisqualificationNum += (v.disqualificationNum != null ? Number(v.disqualificationNum) : 0)
|
|
|
sumExaminingNum += (v.examiningNum != null ? Number(v.examiningNum) : 0)
|
|
|
+ // v.qualifiedNum = Number(v.prodNum) - Number(v.rejectNum)
|
|
|
})
|
|
|
auxiliaryDayworkItem.value.rejectNum = sumReject
|
|
|
auxiliaryDayworkItem.value.disqualificationNum = sumDisqualificationNum
|
|
|
@@ -621,7 +635,39 @@
|
|
|
|
|
|
&.number {
|
|
|
width: 104rpx;
|
|
|
- text-align: center;
|
|
|
+ text-align: left;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ .half-result {
|
|
|
+ border-bottom: 1px solid #9f9f9f;
|
|
|
+ padding-bottom: 32rpx;
|
|
|
+ align-items: center;
|
|
|
+
|
|
|
+ .label {
|
|
|
+ width: 160rpx;
|
|
|
+ }
|
|
|
+
|
|
|
+ .value {
|
|
|
+ flex: 1;
|
|
|
+
|
|
|
+ textarea {
|
|
|
+ flex: 1;
|
|
|
+ border: 1px solid #888888;
|
|
|
+ box-sizing: border-box;
|
|
|
+ padding: 16rpx;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ input {
|
|
|
+ width: 140rpx;
|
|
|
+ height: 56rpx;
|
|
|
+ border: 1px solid #9f9f9f;
|
|
|
+ font-size: 28rpx;
|
|
|
+
|
|
|
+ &.number {
|
|
|
+ text-align: left;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -690,6 +736,28 @@
|
|
|
border: 1px solid #9f9f9f;
|
|
|
font-size: 28rpx;
|
|
|
text-align: center;
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ .half-result {
|
|
|
+ align-items: center;
|
|
|
+
|
|
|
+ .label {
|
|
|
+ width: 112rpx;
|
|
|
+ }
|
|
|
+
|
|
|
+ input {
|
|
|
+ width: 20px;
|
|
|
+ height: 56rpx;
|
|
|
+ border: 1px solid #9f9f9f;
|
|
|
+ font-size: 28rpx;
|
|
|
+ text-align: center;
|
|
|
+
|
|
|
+ &.number {
|
|
|
+ width: 104rpx;
|
|
|
+ text-align: left;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
