|
|
@ -164,35 +164,39 @@
|
|
|
|
<!-- SOP预览-->
|
|
|
|
<!-- SOP预览-->
|
|
|
|
<!-- </el-button>-->
|
|
|
|
<!-- </el-button>-->
|
|
|
|
|
|
|
|
|
|
|
|
<el-popconfirm
|
|
|
|
<!-- <el-popconfirm-->
|
|
|
|
v-if="($route.query && $route.query.id) === '2'"
|
|
|
|
<!-- v-if="($route.query && $route.query.id) === '2'"-->
|
|
|
|
cancel-button-text='否'
|
|
|
|
<!-- cancel-button-text='否'-->
|
|
|
|
confirm-button-text='是'
|
|
|
|
<!-- confirm-button-text='是'-->
|
|
|
|
icon="el-icon-info"
|
|
|
|
<!-- icon="el-icon-info"-->
|
|
|
|
icon-color="red"
|
|
|
|
<!-- icon-color="red"-->
|
|
|
|
title="确定开始计划吗?"
|
|
|
|
<!-- title="确定开始计划吗?"-->
|
|
|
|
@confirm="startPlan(scope.row)"
|
|
|
|
<!-- @confirm="startPlan(scope.row)"-->
|
|
|
|
>
|
|
|
|
<!-- >-->
|
|
|
|
<el-button
|
|
|
|
<!-- <el-button-->
|
|
|
|
slot="reference"
|
|
|
|
<!-- slot="reference"-->
|
|
|
|
size="small"
|
|
|
|
<!-- size="small"-->
|
|
|
|
type="text">开始
|
|
|
|
<!-- type="text">开始-->
|
|
|
|
</el-button>
|
|
|
|
<!-- </el-button>-->
|
|
|
|
</el-popconfirm>
|
|
|
|
<!-- </el-popconfirm>-->
|
|
|
|
|
|
|
|
|
|
|
|
<el-popover
|
|
|
|
<el-popover
|
|
|
|
placement="top"
|
|
|
|
placement="top"
|
|
|
|
|
|
|
|
title="标题"
|
|
|
|
width="400"
|
|
|
|
width="400"
|
|
|
|
|
|
|
|
ref="popoverRef"
|
|
|
|
v-if="($route.query && $route.query.id) !== '2'"
|
|
|
|
v-if="($route.query && $route.query.id) !== '2'"
|
|
|
|
v-model="visible">
|
|
|
|
trigger="click">
|
|
|
|
<div style="margin: 15px 0;">
|
|
|
|
<div>
|
|
|
|
<el-input placeholder="请输入物料条码" v-model="input1" class="input-with-select">
|
|
|
|
<div style="margin: 15px 0;">
|
|
|
|
<el-button slot="append" icon="el-icon-full-screen"></el-button>
|
|
|
|
<el-input placeholder="请输入物料条码" v-model="input1" class="input-with-select">
|
|
|
|
</el-input>
|
|
|
|
<el-button slot="append" icon="el-icon-full-screen"></el-button>
|
|
|
|
</div>
|
|
|
|
</el-input>
|
|
|
|
<div style="text-align: right; margin: 0">
|
|
|
|
</div>
|
|
|
|
<el-button size="mini" type="text" @click="visible = false">取消</el-button>
|
|
|
|
<div style="text-align: right; margin: 0">
|
|
|
|
<el-button type="primary" size="mini" @click="startPlan1(scope.row)">确定</el-button>
|
|
|
|
<el-button size="mini" type="text" @click="closePopover">取消</el-button>
|
|
|
|
|
|
|
|
<el-button type="primary" size="mini" @click="startPlan1(scope.row)">确定</el-button>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<el-button
|
|
|
|
<el-button
|
|
|
|
slot="reference"
|
|
|
|
slot="reference"
|
|
|
@ -200,6 +204,7 @@
|
|
|
|
type="text">开始
|
|
|
|
type="text">开始
|
|
|
|
</el-button>
|
|
|
|
</el-button>
|
|
|
|
</el-popover>
|
|
|
|
</el-popover>
|
|
|
|
|
|
|
|
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table>
|
|
|
|
</el-table>
|
|
|
@ -437,7 +442,6 @@ export default {
|
|
|
|
data() {
|
|
|
|
data() {
|
|
|
|
return {
|
|
|
|
return {
|
|
|
|
input1:null,
|
|
|
|
input1:null,
|
|
|
|
visible:false,
|
|
|
|
|
|
|
|
PrintData: {},
|
|
|
|
PrintData: {},
|
|
|
|
printModel: false,
|
|
|
|
printModel: false,
|
|
|
|
assignModel: false,
|
|
|
|
assignModel: false,
|
|
|
@ -739,9 +743,14 @@ export default {
|
|
|
|
this.form.planDetailStatus = setState(data.data.planDetailStatus)
|
|
|
|
this.form.planDetailStatus = setState(data.data.planDetailStatus)
|
|
|
|
this.getInfo(val)
|
|
|
|
this.getInfo(val)
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
closePopover(){
|
|
|
|
|
|
|
|
document.body.click()
|
|
|
|
|
|
|
|
},
|
|
|
|
async startPlan1(val) {
|
|
|
|
async startPlan1(val) {
|
|
|
|
this.visible = false
|
|
|
|
|
|
|
|
console.log(this.input1)
|
|
|
|
console.log(this.input1)
|
|
|
|
|
|
|
|
console.log(val)
|
|
|
|
|
|
|
|
document.body.click()
|
|
|
|
|
|
|
|
this.input1 = null
|
|
|
|
|
|
|
|
|
|
|
|
// const data = await startNextProductPlanDetail({planId: val.planId})
|
|
|
|
// const data = await startNextProductPlanDetail({planId: val.planId})
|
|
|
|
// if (data.code === 200) {
|
|
|
|
// if (data.code === 200) {
|
|
|
@ -1320,7 +1329,7 @@ export default {
|
|
|
|
cancelRawBack() {
|
|
|
|
cancelRawBack() {
|
|
|
|
this.rawBackVisible = false;
|
|
|
|
this.rawBackVisible = false;
|
|
|
|
this.resetRawBack();
|
|
|
|
this.resetRawBack();
|
|
|
|
}
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|