|
|
@ -47,6 +47,7 @@ |
|
|
<el-input v-model="searchData.site" style="width: 85px"></el-input> |
|
|
<el-input v-model="searchData.site" style="width: 85px"></el-input> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
<el-form-item :label="'机台编号:'"> |
|
|
<el-form-item :label="'机台编号:'"> |
|
|
|
|
|
<span slot="label" style="" @click="getBaseList(88)"><a herf="#">机台编号:</a></span> |
|
|
<el-input v-model="searchData.resourceId" style="width: 110px"></el-input> |
|
|
<el-input v-model="searchData.resourceId" style="width: 110px"></el-input> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
<el-form-item :label="'计划开工时间:'"> |
|
|
<el-form-item :label="'计划开工时间:'"> |
|
|
@ -199,6 +200,9 @@ |
|
|
<comPartStock ref="comPartStock" :close-on-click-modal="false" |
|
|
<comPartStock ref="comPartStock" :close-on-click-modal="false" |
|
|
:visible.sync="showPartStockFlag"> |
|
|
:visible.sync="showPartStockFlag"> |
|
|
</comPartStock> |
|
|
</comPartStock> |
|
|
|
|
|
|
|
|
|
|
|
<!--列表的组件--> |
|
|
|
|
|
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist> |
|
|
</div> |
|
|
</div> |
|
|
</template> |
|
|
</template> |
|
|
|
|
|
|
|
|
@ -218,6 +222,7 @@ import { |
|
|
} from '@/api/yieldReport/produce_order.js'; |
|
|
} from '@/api/yieldReport/produce_order.js'; |
|
|
|
|
|
|
|
|
/*引入组件*/ |
|
|
/*引入组件*/ |
|
|
|
|
|
import Chooselist from '@/views/modules/common/Chooselist';/*列表组件*/ |
|
|
import comSwitchOperator from "./com_switch_operator";/*切换操作员*/ |
|
|
import comSwitchOperator from "./com_switch_operator";/*切换操作员*/ |
|
|
import comProduceReportNormal from "./com_produce_report_normal";/* 报工的组件*/ |
|
|
import comProduceReportNormal from "./com_produce_report_normal";/* 报工的组件*/ |
|
|
import comFinishSchedule from "./com_finish_schedule";/*结束派工的组件*/ |
|
|
import comFinishSchedule from "./com_finish_schedule";/*结束派工的组件*/ |
|
|
@ -251,7 +256,7 @@ export default { |
|
|
orderNo: '', |
|
|
orderNo: '', |
|
|
seqNo: '', |
|
|
seqNo: '', |
|
|
planStartTime1: '', |
|
|
planStartTime1: '', |
|
|
planStartTime2: this.dayjs(new Date()).format('YYYY-MM-DD'), |
|
|
|
|
|
|
|
|
planStartTime2: '', |
|
|
closedFlag: 'N', |
|
|
closedFlag: 'N', |
|
|
status: 1, |
|
|
status: 1, |
|
|
username: this.$store.state.user.name, |
|
|
username: this.$store.state.user.name, |
|
|
@ -1104,6 +1109,7 @@ export default { |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
components: { |
|
|
components: { |
|
|
|
|
|
Chooselist,/*选择的组件*/ |
|
|
Com_split_schedule, |
|
|
Com_split_schedule, |
|
|
comSwitchOperator,/*切换用户的组件*/ |
|
|
comSwitchOperator,/*切换用户的组件*/ |
|
|
comProduceReportNormal,/*报工页面的组件*/ |
|
|
comProduceReportNormal,/*报工页面的组件*/ |
|
|
@ -1925,7 +1931,26 @@ export default { |
|
|
this.$refs.comProduceReportNormal.init(this.currentRow.seqNo, this.operatorData); |
|
|
this.$refs.comProduceReportNormal.init(this.currentRow.seqNo, this.operatorData); |
|
|
}); |
|
|
}); |
|
|
}) |
|
|
}) |
|
|
} |
|
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
/*列表方法的回调*/ |
|
|
|
|
|
getBaseData(val){ |
|
|
|
|
|
if (this.tagNo === 88){ |
|
|
|
|
|
this.searchData.resourceId = val.ResourceID; |
|
|
|
|
|
} |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
// 获取基础数据列表 |
|
|
|
|
|
getBaseList(val){ |
|
|
|
|
|
this.tagNo = val |
|
|
|
|
|
this.$nextTick(() => { |
|
|
|
|
|
let strVal = ""; |
|
|
|
|
|
if (val === 88){ |
|
|
|
|
|
strVal = this.searchData.resourceId; |
|
|
|
|
|
} |
|
|
|
|
|
this.$refs.baseList.init(val,strVal, " AND WorkCenterNo <> 'FQC'"); |
|
|
|
|
|
}) |
|
|
|
|
|
}, |
|
|
}, |
|
|
}, |
|
|
created() { |
|
|
created() { |
|
|
//不查询 |
|
|
//不查询 |
|
|
|