优化

pages/pda/components/uni-steps.vue

@@ -88,7 +88,7 @@
 					})
 					return false
 				}
-				
+	
 				if(this.clientEnvironmentId == 3) { // 碳谷
 					this.taskId = item.taskId
 					this.$emit('selectStep', item);

pages/pda/jobBooking/index/index.vue

@@ -10,8 +10,6 @@
 				<view class="card_box">
 
 
-
-
 					<workOrderBom :item='objData' v-if='objData' @handleScan='handleScan'></workOrderBom>
 
 
@@ -24,7 +22,6 @@
 					</modelBom>
 
 
-
 					<jobBom v-if='isLoad' :item='objData' :notFormed='objData.notFormedList' @penalize='penalize'
 						@modeNum='modeNum'></jobBom>
 
@@ -33,10 +30,10 @@
 					<revolvingDiskBom v-if="isLoad && objData.revolvingDiskList.length > 0"
 						:revolvingDiskList="objData.revolvingDiskList"></revolvingDiskBom>
 
-					<oneJobBom
+			<!-- 		<oneJobBom
 						v-if='objData.instanceList &&  objData.instanceList.length != 0 && taskType != 4 && taskType != 6'
 						:item='objData' :list='objData.instanceList'>
-					</oneJobBom>
+					</oneJobBom> -->
 
 
 					<semiProductJobBom
@@ -44,11 +41,9 @@
 						:item='objData' :list='objData.semiProductList'></semiProductJobBom>
 
 
-
-
 					<oneJobQualityBom
-						v-if='objData.instanceList &&  objData.instanceList.length != 0 && taskType ==6 && clientEnvironmentId == 3'
-						:item='objData' :list='objData.instanceList'></oneJobQualityBom>
+						v-if='objData.semiProductList &&  objData.semiProductList.length != 0 && taskType ==6 && clientEnvironmentId == 3'
+						:item='objData' :list='objData.semiProductList'></oneJobQualityBom>
 
 					<byProductBom v-if='objData.productRecycleList.length != 0 ' :list='objData.productRecycleList'
 						@penalize='penalize'>
@@ -346,7 +341,6 @@
 
 			handleScan(id, type) {
 
-
 				let _this = this
 				uni.scanCode({
 					success: function(res) {
@@ -394,8 +388,6 @@
 				this.isLoad = false
 				getByIdReport(this.id, this.taskId).then(res => {
 
-					console.log(22, res)
-
 					this.objData = res
 					if (!this.objData.hasOwnProperty('turnover')) {
 						this.objData['turnover'] = []
@@ -451,7 +443,7 @@
 
 
 					if (this.taskType == 6 && this.clientEnvironmentId == 3) {
-						this.objData.instanceList = this.objData.pickOutInList
+						this.objData.semiProductList = this.objData.pickOutInList
 					}
 
 

pages/systemSettings/index.vue

@@ -115,12 +115,15 @@ export default {
           console.log(res,res.confirm,'-----确认退出登录');
           if (res.confirm) {
           console.log('-----确认退出登录9999999');
+		  uni.clearStorage()
           try {
             postJ(this.apiUrl + '/user/logout')
               .then(res => {
+
                 uni.removeStorageSync('token')
                 uni.removeStorageSync('userInfo')
 				uni.removeStorageSync('treeList')
+			
 				
                 uni.reLaunch({
                   url: '/pages/login/login'