ysy 2 tahun lalu
induk
melakukan
524ad5d64b

+ 12 - 10
pages/pda/jobBooking/components/oneJobBom.vue

@@ -95,7 +95,7 @@
 					<view class="item ww25">报工重量kg</view>
 					<view class="item ww25" v-if="['CVI', 'PIP' ].includes(taskTypeName)">质检结果
 					</view>
-					<view class="item ww25":class="[  ['CVI', 'PIP' ].includes(taskTypeName) ? 'ww25' : 'ww50' ]">处置
+					<view class="item ww25" :class="[  ['CVI', 'PIP' ].includes(taskTypeName) ? 'ww25' : 'ww50' ]">处置
 					</view>
 
 				</view>
@@ -112,16 +112,21 @@
 							v-if="['CVI', 'PIP' ].includes(taskTypeName)">
 							<view class="numerate">点击计算</view>
 						</view>
-						
-						
-					<!-- 	<view class="item ww25" v-if="['CVI', 'PIP' ].includes(taskTypeName)">
+
+
+						<!-- 	<view class="item ww25" v-if="['CVI', 'PIP' ].includes(taskTypeName)">
 							{{it.extInfo.taskName }}
 						</view> -->
-
-						<view class="item " :class="[  ['CVI', 'PIP' ].includes(taskTypeName) ? 'ww25' : 'ww50' ]">
+						
+						<view class="item"  v-if='isDetails'  :class="[  ['CVI', 'PIP' ].includes(taskTypeName) ? 'ww25' : 'ww50' ]">
+							{{it.extInfo.taskName}}
+						</view>
+ 
+						<view class="item "  v-else :class="[  ['CVI', 'PIP' ].includes(taskTypeName) ? 'ww25' : 'ww50' ]">
 							<zxz-uni-data-select :localdata="stepsList" v-model="it.extInfo.taskId" dataValue='taskId'
 								format='{taskTypeName}' dataKey="taskId" filterable
 								:clear='false'></zxz-uni-data-select>
+								
 						</view>
 
 
@@ -225,7 +230,6 @@
 
 
 
-
 											<view class="item ww10 rx-cc" @click="getDelete(idx)">
 												<uni-icons custom-prefix="iconfont" type="icon-shanchu" size="20"
 													color="#fa3534"></uni-icons>
@@ -240,7 +244,6 @@
 							<view class="formula_box" v-if="taskTypeName == 'PIP'">计算公式: 坯体图体积*要求密度*系数 </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>
@@ -351,10 +354,9 @@
 
 
 			getSteps() {
-
+			
 				getTaskInstanceList(this.item.workOrderId).then(res => {
 					this.stepsList = res
-
 				})
 			},
 

+ 1 - 0
pages/pda/jobBooking/index/index.vue

@@ -347,6 +347,7 @@
 			getList() {
 				this.isLoad = false
 				getByIdReport(this.id, this.taskId).then(res => {
+					console.log('11', res)
 
 					this.objData = res
 					if (!this.objData.hasOwnProperty('turnover')) {