|
|
@ -23,7 +23,6 @@
|
|
|
|
<el-form-item label="计划结束时间:">{{ form.planEndTime }}</el-form-item>
|
|
|
|
<el-form-item label="计划结束时间:">{{ form.planEndTime }}</el-form-item>
|
|
|
|
<el-form-item label="任务状态:">
|
|
|
|
<el-form-item label="任务状态:">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<dict-tag :options="dict.type.plan_status" :value="form.orderStatus"/>
|
|
|
|
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
|
|
|
@ -166,15 +165,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
<el-table-column align="center" label="状态" prop="planStatus" width="150">
|
|
|
|
<el-table-column align="center" label="状态" prop="planStatus" width="150">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<el-select v-model="scope.row.planStatus" :disabled="true" placeholder="请选择状态"
|
|
|
|
{{scope.row.planStatus}}
|
|
|
|
v-if="scope.row.children == null || scope.row.children === undefined || scope.row.processType === PROCESS_TYPE.AUTO">
|
|
|
|
|
|
|
|
<el-option
|
|
|
|
|
|
|
|
v-for="dict in dict.type.product_status"
|
|
|
|
|
|
|
|
:key="dict.value"
|
|
|
|
|
|
|
|
:label="dict.label"
|
|
|
|
|
|
|
|
:value="dict.value"
|
|
|
|
|
|
|
|
/>
|
|
|
|
|
|
|
|
</el-select>
|
|
|
|
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
|
|
|
@ -482,8 +474,8 @@ export default {
|
|
|
|
single: true,
|
|
|
|
single: true,
|
|
|
|
checkedMesProductPlanList: [],
|
|
|
|
checkedMesProductPlanList: [],
|
|
|
|
// 上传的文件服务器地址
|
|
|
|
// 上传的文件服务器地址
|
|
|
|
uploadImgUrl: process.env.VUE_APP_BASE_API,
|
|
|
|
uploadImgUrl: import.meta.env.VUE_APP_BASE_API,
|
|
|
|
uploadDrawingUrl: process.env.VUE_APP_BASE_API + "/file/upload2SharePath",
|
|
|
|
uploadDrawingUrl: import.meta.env.VUE_APP_BASE_API + "/file/upload2SharePath",
|
|
|
|
// 选中选项卡的 name
|
|
|
|
// 选中选项卡的 name
|
|
|
|
activeName: "columnInfo",
|
|
|
|
activeName: "columnInfo",
|
|
|
|
// 表格的高度
|
|
|
|
// 表格的高度
|
|
|
@ -564,7 +556,7 @@ export default {
|
|
|
|
//文件上传-生产派工对象
|
|
|
|
//文件上传-生产派工对象
|
|
|
|
addProductPlanObject: {},
|
|
|
|
addProductPlanObject: {},
|
|
|
|
headers: {
|
|
|
|
headers: {
|
|
|
|
Authorization: "Bearer " + getToken(),
|
|
|
|
Authorization: "Bearer " ,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
PROCESS_ID: {
|
|
|
|
PROCESS_ID: {
|
|
|
|
BENDING_PROCESS_ID: 42
|
|
|
|
BENDING_PROCESS_ID: 42
|
|
|
|