src/views/wpm_bx/mlogbw_check.vue

@@ -36,7 +36,6 @@
 					:addTemplate="addTemplate"
 					placeholder="暂无数据"
 					:hideAdd="hideAdd"
-					:pushType="pushType"
 					:canMultiple = "canMultiple"
 					@selectChange="selectChange" 
 					@selectAllChange="selectAllChange"
@@ -47,11 +46,10 @@
 							<span v-if="mode == 'outs'">{{ scope.row.number }}</span>
 							<span v-if="mode == 'outs'&&scope.row.wpr_number_out!==null&&scope.row.wpr_number_out!==undefined">——{{ scope.row.wpr_number_out }}</span>
 							<el-select
-								v-if="scope.row.isEdit&&mode == 'ins'"
+								v-if="scope.row.isEdit&&mode == 'ins'&&route_code!=='niuzhuan'"
 								v-model="scope.row.wpr"
 								placeholder="动态成品"
 								clearable
-								filterable
 								style="width: 100%"
 								@change="optionChange(scope.row)"
 							>
@@ -509,7 +507,6 @@ export default {
 			wprNumber:"",
 			route_code:"",
 			wprInputText:"",
-			pushType:"unshift",
 			params: {mlogb:'',page:0},
 			insInput:false,
 			canMultiple:false,
@@ -585,9 +582,7 @@ export default {
 			}
 			if(that.mode == 'ins'){
 				if(that.route_code=='niuzhuan'){
-					that.getEquipment4();
 					that.gettestitem();
-					that.getOptions();
 				}else{
 					that.getOptions();
 					that.getList();
@@ -915,9 +910,9 @@ export default {
 		},
         formTableEdit(row) {
             let that = this;
-			// if(that.route_code=='niuzhuan'&&that.optionsEq.length==0){
-			// 	that.getEquipment4();
-			// }
+			if(that.route_code=='niuzhuan'&&that.optionsEq.length==0){
+				that.getEquipment4();
+			}
             that.mlogbwlist.forEach((item, index) => {
 				if (item.id == row.id) {
 					that.mlogbwlist[index].isEdit = true;
@@ -1175,9 +1170,9 @@ export default {
 							that.mlogbwlist[0].work_start_time = that.$TOOL.dateFormat(date, 'yyyy-MM-dd hh:mm:ss');
 							that.timeChange(that.mlogbwlist[0]);
 						}
-						// if(that.optionsEq.length==0){
-						// 	that.getEquipment4();
-						// }
+						if(that.optionsEq.length==0){
+							that.getEquipment4();
+						}
 					}
 					if(that.setForm.cd_req_addr!==null&&!that.insInput){
 						//执行cd_req_addr,获取检测设备的数据