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