oyq28 hai 3 meses
pai
achega
7eabaad317

+ 11 - 7
imcs-ui/src/views/zuihou/dispatchMgr/tools/Index.vue

@@ -271,16 +271,16 @@
 
 	<el-card class="box-card">
         <div slot="header" class="clearfix">刀具取放处理</div>
-		<el-form ref="form10" :model="form11" :rules="rules4" label-width="80px">
+		<el-form ref="form11" :model="form11" :rules="rules4" label-width="100px">
 			<el-row :gutter="12" >
-				<el-col :xs="6" :sm="5">
+				<el-col :xs="2" :sm="4">
 					<el-form-item label="起始位:" prop="start">
 						<el-tooltip content="例如:CT_LAUPT00101" placement="top">
                     		<el-input v-model="form11.start" placeholder="起始库位"></el-input>
 					   </el-tooltip>
 					</el-form-item>
 				</el-col>
-				<el-col :xs="6" :sm="5">
+				<el-col :xs="2" :sm="4">
 					<el-form-item label="设备类型:" prop="goalType">
 						<el-tooltip content="例如:CT_127" placement="top">
                     		<el-select v-model="form11.goalType" placeholder="选择设备类型" @change="choose">
@@ -289,7 +289,7 @@
 						</el-tooltip>
 					</el-form-item>
 				</el-col>				
-				<el-col :xs="6" :sm="5">
+				<el-col :xs="2" :sm="4">
 					<el-form-item label="目的位:" prop="goal">
 						<el-tooltip content="例如:CT_LAUPT00101" placement="top">
                     		<el-select v-model="form11.goal" placeholder="选择目标位">								
@@ -298,12 +298,12 @@
 					   </el-tooltip>
 					</el-form-item>
 				</el-col>
-				<el-col :xs="6" :sm="5">
+				<el-col :xs="3" :sm="4">
 					<el-form-item label="起始刀位号:" prop="cutStartNo">
                     	<el-input-number v-model="form11.cutStartNo" :min="0" :max="40"></el-input-number>
 					</el-form-item>
 				</el-col>
-				<el-col :xs="6" :sm="5">
+				<el-col :xs="4" :sm="4">
 					<el-form-item label="目的刀位号:" prop="cutGoalNo">
                     	<el-input-number v-model="form11.cutGoalNo" :min="0" :max="40"></el-input-number>
 					</el-form-item>
@@ -744,7 +744,11 @@
 						const res2 = response2.data
 						this.cutToolStorgeList = [{"name":"请选择","pointId":""}]
 						if(res2.isSuccess){
-							this.cutToolStorgeList = res2.data
+							let tempList = res2.data
+							this.cutToolStorgeList = tempList.map(item=>{
+								item.pointId = "CT_"+item.pointId
+								return item;
+							})
 							//console.log(this.cutToolStorgeList)
 						}
 						}).finally(()=>{

+ 1 - 1
imcs-ui/src/views/zuihou/lineSideLibrary/lineSideMgr/components/Edit.vue

@@ -97,7 +97,7 @@ export default {
       },
       locationList: [],  // 【库位】下拉数据
       // 自动填充
-      restaurants: [],
+      restaurants: [],      
     	timeout:  null
     }
   },