优化

pages/center/about/about.vue

@@ -8,7 +8,6 @@
     >
       <!-- <view class="title">关于株洲硬质合金集团型材分公司</view> -->
 	   <view class="title">关于湖南碳谷新材料有限公司</view>
-	   
 	    <!-- <view class="title">关于株洲索尔切削刀具有限公司</view> -->
 
     </uni-nav-bar>

pages/login/login.vue

@@ -10,7 +10,8 @@
     <view class="login-title">
       <label>智慧工厂信息化系统</label>
       <!-- <text>株洲硬质合金集团型材分公司</text> -->
-	  <text>湖南碳谷新材料有限公司</text>
+	  <!-- <text>湖南碳谷新材料有限公司</text> -->
+	   <text >株洲索尔切削刀具有限公司</text> 
 	  
     </view>
     <view>

pages/pda/components/bottomOperate.vue

@@ -15,11 +15,7 @@
 			
 			
 
-			<view v-for="(item, idx) in btnsList" :key="idx+ 'btns'" class="list rx-bc" @click="operate(item.type)">
-				<view class="round">{{idx + 1}}</view>
-				<view class="name">{{item.name}}</view>
-				<image class="arrow_right" src="~@/static/pda/arrow_right.svg"></image>
-			</view>
+			
 		</view>
 
 
@@ -37,10 +33,7 @@
 		props: {
 			state: String,
 
-			btns: {
-				type: Array,
-				default: () => []
-			}
+			
 		},
 
 	  watch: {
@@ -72,6 +65,7 @@
 							name: '报工',
 							type: 'jobBooking'
 						},
+						{ name: '更换周转车', type: 'turnover'}
 
 
 					]

pages/pda/feeding/index/index.vue

@@ -67,7 +67,7 @@
 						<u-form-item label="工艺路线:" class="required-form" borderBottom prop="assetType">
 
 							<zxz-uni-data-select :localdata="produceList" v-model="formData.produceRoutingId"
-								dataValue='id' format='{name}'></zxz-uni-data-select>
+								dataValue='id'   dataKey="name" filterable format='{name}'></zxz-uni-data-select>
 
 						</u-form-item>
 

pages/pda/jobBooking/components/jobBom.vue

@@ -102,7 +102,7 @@
 					<view class="lable rx-cc">舟皿名称</view>
 					<view class="content ">
 						<zxz-uni-data-select :localdata="boatList" v-model="item.categoryId" dataValue='id'
-							format='{name}-{code}' :clear='false' @change='inputChange'></zxz-uni-data-select>
+							format='{name}-{code}'  dataKey="code" filterable :clear='false' @change='inputChange'></zxz-uni-data-select>
 					</view>
 				</view>
 

pages/pda/jobBooking/index/index.vue

@@ -57,8 +57,8 @@
 
 					<u-form labelPosition="left" :model="formData" labelWidth="180" labelAlign="left" class="baseForm">
 						<u-form-item label="仓库:" class="required-form" borderBottom prop="warehouseId">
-							<zxz-uni-data-select :localdata="warehouseList" v-model="formData.warehouseId"
-								dataValue='id' format='{name}'></zxz-uni-data-select>
+							<zxz-uni-data-select :localdata="warehouseList"  v-model="formData.warehouseId"
+								dataValue='id' dataKey="name" filterable format='{name}' ></zxz-uni-data-select>
 						</u-form-item>
 
 
@@ -412,6 +412,10 @@
 					this.searchShow = true
 				}
 			},
+			
+			inputChange(e) {
+				console.log(e)
+			},
 
 			searchCancel() {
 				this.searchShow = false
@@ -553,7 +557,7 @@
 	}
 
 	.search_list {
-		min-height: 300rpx;
+		min-height: 500rpx;
 		padding: 0 32rpx;
 	}
 </style>

pages/pda/picking/details.vue

@@ -65,7 +65,7 @@
 								<view class="lable rx-cc">领料仓库</view>
 								<view class="content pd4">
 									<zxz-uni-data-select :localdata="mate.warehouseList" v-model="mate.warehouseId"
-										dataValue='id' format='{name}' :clear='false'></zxz-uni-data-select>
+										dataValue='id' format='{name}'  dataKey="name" filterable :clear='false'></zxz-uni-data-select>
 								</view>
 							</view>
 

pages/pda/picking/index/index.vue

@@ -78,7 +78,7 @@
 				   >
 				   
 				   <zxz-uni-data-select :localdata="produceList" v-model="formData.produceRoutingId"
-				   	dataValue='id' format='{name}' ></zxz-uni-data-select>
+				   	dataValue='id' format='{name}'  dataKey="name" filterable ></zxz-uni-data-select>
 				   
 				   </u-form-item>
 				   

pages/pda/workOrder/extrusionMolding/index.vue

@@ -213,11 +213,11 @@
 			getSteps() {
 				getTaskInstanceList(this.id).then(res => {
 					
-				for(let i = 0; i < res.length; i++) {
-					if(res[i].taskTypeName == '自然干燥' ||res[i].taskTypeName == '升温干燥') {
-						res[i - 1].btns = [ { name: '更换周转车', type: 'turnover'}]
-					}
-				}
+				// for(let i = 0; i < res.length; i++) {
+				// 	if(res[i].taskTypeName == '自然干燥' ||res[i].taskTypeName == '升温干燥') {
+				// 		res[i - 1].btns = [ { name: '更换周转车', type: 'turnover'}]
+				// 	}
+				// }
 					this.stepsList = res