ysy пре 2 година
родитељ
комит
ecc7608467

+ 1 - 1
pages/pda/components/bottomOperate.vue

@@ -448,7 +448,7 @@
 		padding: 10rpx 20rpx;
 
 		/deep/ .u-button {
-			width: 160rpx;
+			width: 180rpx;
 		}
 	}
 

+ 0 - 2
pages/pda/feeding/details.vue

@@ -250,8 +250,6 @@
 
 
 
-
-
 				batchSave(this.List).then(res => {
 
 					uni.navigateTo({

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

@@ -74,11 +74,17 @@
 					<view class="operate_box rx-sc">
 						<u-button size="small" class="u-reset-button" type="success" @click="handAdd">手动添加</u-button>
 					</view>
+					
+					
+						<view style="height: 100rpx;"></view>
 
 				</view>
 
 			</u-list>
 		</view>
+		
+		
+	
 
 
 		<view class="bottom-wrapper">

+ 2 - 2
pages/pda/workOrder/extrusionMolding/index.vue

@@ -316,7 +316,7 @@
 						url
 					})
 				} else if (type == 'feeding') {
-					if (this.feedAllow ) {
+					if (this.feedAllow ||  this.clientEnvironmentId == 3) {
 						url = '/pages/pda/feeding/details'
 						let _arr = JSON.stringify([this.info.id])
 						url += `?arr=${encodeURIComponent(_arr)}&taskId=${taskId }&taskName=${taskName}`
@@ -331,7 +331,7 @@
 					}
 
 				} else if (type == 'jobBooking') {
-					if (!this.feedAllow ) {
+					if (!this.feedAllow || this.clientEnvironmentId == 3) {
 						url = '/pages/pda/jobBooking/index/index'
 						url += `?id=${this.info.id}&taskId=${taskId }&taskName=${taskName}&taskType=${this.currentType}`
 						uni.navigateTo({

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

@@ -69,6 +69,7 @@
 			async getList() {
 				let params = {
 					pageNum: this.page,
+					customerClient: 2,
 					size: this.size,
 					workOrderType: 1,
 					status: [4, 5, 6, 7],

+ 3 - 0
pages/pda/workOrder/search/index.vue

@@ -132,6 +132,7 @@
 				</checkbox>
 			</view>
 			<view>
+				
 				<u-button v-if='rootCategoryLevelId != 23' type="success" size="small" class="u-reset-button"
 					:disabled="!checkListLen" @click="jumpAdd(1)">
 					<view> 选择( {{ checkListLen }} ) </view>
@@ -414,12 +415,14 @@
 
 				treeByPid(params).then(res => {
 					this.classificationList = res
+					console.log(11, res)
 					this.confirm([res[0].id], res[0].name, res[0].rootCategoryLevelId)
 				})
 			},
 
 			confirm(id, name, rootCategoryLevelId) {
 				this.rootCategoryLevelId = rootCategoryLevelId
+			      console.log(333,this.rootCategoryLevelId )
 				this.categoryLevelId = id
 
 				this.list = []