|
|
@@ -119,7 +119,8 @@
|
|
|
<view class="lable lable150 rx-cc ">尺寸</view>
|
|
|
<view class="content content_num">
|
|
|
<view v-if='isDetails'>
|
|
|
- {{ it.extInfo.dimension == 1 ? '合格' : it.extInfo.dimension == 2 ? '不合格' : '' }}</view>
|
|
|
+ {{ it.extInfo.dimension == 1 ? '合格' : it.extInfo.dimension == 2 ? '不合格' : '' }}
|
|
|
+ </view>
|
|
|
<zxz-uni-data-select v-else :localdata="qualityList" v-model="it.extInfo.dimension"
|
|
|
dataValue='value' format='{name}' dataKey="value" filterable
|
|
|
:clear='false'></zxz-uni-data-select>
|
|
|
@@ -137,7 +138,8 @@
|
|
|
|
|
|
<view class="content_table2">
|
|
|
<view class="head row rx-sc">
|
|
|
- <view class="item ww25">{{it.extInfo.lastWeight ? '上道工序重量' : '物料重量' }} {{it.extInfo.weightUnit}}</view>
|
|
|
+ <view class="item ww25">{{it.extInfo.lastWeight ? '上道工序重量' : '物料重量' }} {{it.extInfo.weightUnit}}
|
|
|
+ </view>
|
|
|
<view class="item ww25">报工重量{{it.extInfo.weightUnit}}</view>
|
|
|
<view class="item ww25" v-if="isFirstTask == 1">质检结果
|
|
|
</view>
|
|
|
@@ -238,52 +240,51 @@
|
|
|
|
|
|
|
|
|
<view class="item ww20" v-if=" (idx == 0 || idx != paramList.length - 1)">
|
|
|
- > {{it.CVIWeight}}
|
|
|
- </view>
|
|
|
+ < {{it.CVIWeight}} </view>
|
|
|
|
|
|
- <view class="item ww20" v-if=" paramList.length > 1 && idx == paramList.length - 1">
|
|
|
- ≥ {{it.CVIWeight }}
|
|
|
- </view>
|
|
|
+ <view class="item ww20" v-if=" paramList.length > 1 && idx == paramList.length - 1">
|
|
|
+ ≥ {{it.CVIWeight }}
|
|
|
+ </view>
|
|
|
|
|
|
|
|
|
- <view class="item ww10 rx-cc" @click="getDelete(idx)">
|
|
|
- <uni-icons custom-prefix="iconfont" type="icon-shanchu" size="20"
|
|
|
- color="#fa3534"></uni-icons>
|
|
|
- </view>
|
|
|
+ <view class="item ww10 rx-cc" @click="getDelete(idx)">
|
|
|
+ <uni-icons custom-prefix="iconfont" type="icon-shanchu" size="20"
|
|
|
+ color="#fa3534"></uni-icons>
|
|
|
+ </view>
|
|
|
|
|
|
- </view>
|
|
|
+ </view>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- </view>
|
|
|
+ </view>
|
|
|
|
|
|
- <view class="formula_box">计算公式： 物料重量/坯体密度*密度系数 </view>
|
|
|
+ <view class="formula_box">计算公式： 物料重量/坯体密度*密度系数 </view>
|
|
|
|
|
|
|
|
|
- <view class="rx-cc">
|
|
|
- <u-button size="small" class="u-reset-button" style="width: 300rpx;margin: 20rpx;"
|
|
|
- type="success" @click="paramSave">工序列表保存</u-button>
|
|
|
- </view>
|
|
|
+ <view class="rx-cc">
|
|
|
+ <u-button size="small" class="u-reset-button" style="width: 300rpx;margin: 20rpx;"
|
|
|
+ type="success" @click="paramSave">工序列表保存</u-button>
|
|
|
+ </view>
|
|
|
|
|
|
- <view class="reportWeight rx-sc">
|
|
|
- 物料重量: {{weight}} ;
|
|
|
- 报工重量: {{reportWeight}}
|
|
|
+ <view class="reportWeight rx-sc">
|
|
|
+ 物料重量: {{weight}} ;
|
|
|
+ 报工重量: {{reportWeight}}
|
|
|
|
|
|
- </view>
|
|
|
+ </view>
|
|
|
|
|
|
|
|
|
|
|
|
- </view>
|
|
|
+ </view>
|
|
|
|
|
|
|
|
|
- <view class="operate_box rx-sc">
|
|
|
- <u-button size="small" class="u-reset-button" @click="cancel">取消</u-button>
|
|
|
- <u-button size="small" class="u-reset-button" type="success" @click="save">确定</u-button>
|
|
|
+ <view class="operate_box rx-sc">
|
|
|
+ <u-button size="small" class="u-reset-button" @click="cancel">取消</u-button>
|
|
|
+ <u-button size="small" class="u-reset-button" type="success" @click="save">确定</u-button>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
- </view>
|
|
|
|
|
|
|
|
|
</u-popup>
|
|
|
@@ -465,7 +466,7 @@
|
|
|
}
|
|
|
let param = {}
|
|
|
|
|
|
- if (!Object.prototype.hasOwnProperty.call(this.paramObj, 'id')) {
|
|
|
+ if (!Object.prototype.hasOwnProperty.call(this.paramObj, 'id')) {
|
|
|
|
|
|
param = {
|
|
|
paramList: this.paramList,
|
|
|
@@ -533,7 +534,7 @@
|
|
|
|
|
|
|
|
|
if (Number(this.reportWeight) < this.paramList[0].CVIWeight) {
|
|
|
- this.resultObj = this.stepsList[0]
|
|
|
+ this.resultObj = this.paramList[0]
|
|
|
this.setDataSave()
|
|
|
return false
|
|
|
}
|
|
|
@@ -545,20 +546,20 @@
|
|
|
return false
|
|
|
}
|
|
|
|
|
|
- let _arr = JSON.parse(JSON.stringify(this.paramList))
|
|
|
- _arr = _arr.reverse()
|
|
|
- for (let i = 1; i < _arr.length; i++) {
|
|
|
- if (Number(this.reportWeight) > Number(_arr[i].CVIWeight)) {
|
|
|
- this.resultObj = _arr[i]
|
|
|
+
|
|
|
+ for (let i = 1; i < this.paramList.length; i++) {
|
|
|
+ if (Number(this.paramList[i - 1].CVIWeight) < Number(this.reportWeight) && Number(this
|
|
|
+ .reportWeight) < Number(this.paramList[i].CVIWeight)) {
|
|
|
+ this.resultObj = this.paramList[i]
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
this.setDataSave()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
}
|
|
|
|
|
|
|
ysy