修改刀加号选取

imcs-ui/src/views/zuihou/machiningClient/cutToolTasks/components/View1.vue

@@ -88,11 +88,11 @@
 					</el-select>
 				</template>
 			</el-table-column>
-			<el-table-column v-if="this.cutGoalNoIsShow" prop="cutGoalNo" label='目的刀位号' align="center">
-				<template slot-scope="scope">
+			<el-table-column v-if ="this.cutGoalNoIsShow" prop="cutGoalNo" label='目的刀位号' align="center">
+				<template slot-scope="scope" >
 					<!-- <el-input-number v-model="scope.row.cutGoalNo"   :min="0" :max="40"></el-input-number> -->
-					<el-select v-model="scope.row.cutGoalNo" placeholder="选择目的刀位号">								
-						<el-option v-for="cuttoolshelf in CutToolShelfList" :label="cuttoolshelf.name" :value="cuttoolshelf.pointId" :key="cuttoolshelf.pointId"></el-option>		
+					<el-select  v-model="scope.row.cutGoalNo" placeholder="选择目的刀位号">								
+						<el-option v-for="cuttoolshelf in CutToolShelfList" :label="cuttoolshelf" :value="cuttoolshelf" :key="cuttoolshelf"></el-option>		
 					</el-select>
 				</template>
 			</el-table-column>
@@ -232,7 +232,7 @@ export default {
 		cutToolDeviceList: [],
 		cutToolStorgeList: [{"name":"请选择","pointId":""}],
 		CutToolShelfList: [{"name":"请选择","cutGoalNo":""}],
-		cutGoalNoIsShow: true
+		cutGoalNoIsShow: false
     }
   },
   // 实例已经在内存中创建好，此时data和methods已将ok,如果要操作data中的数据或是调用methods中的方法，最早只能在created中操作
@@ -332,18 +332,19 @@ export default {
 						return true		
 					})
 
+					console.log("查询刀架号")
 					// 查询刀架号
 					toolbarApi.getCutToolShelfDevice(params2).then(response2=>{
-						const res3 = response2.data
-						this.CutToolShelfList = [{"name":"请选择","cutGoalNo":""}]
-						if(res3.isSuccess){
-							if(res3.code == 1000){
-								this.cutGoalNoIsShow = false;
-							}else {
-								this.cutGoalNoIsShow = true;
-								this.CutToolShelfList = res2.data
+							const res3 = response2.data
+							this.CutToolShelfList = [{"name":"请选择","cutGoalNo":""}]
+							if(res3.isSuccess){
+								if(res3.msg == "1000"){
+									this.cutGoalNoIsShow = false;
+								}else {
+									this.cutGoalNoIsShow = true;
+									this.CutToolShelfList = res3.data
+								}
 							}
-						}
 						}).finally(()=>{
 							return true		
 						})