|
|
@ -306,6 +306,11 @@
|
|
|
|
<el-table-column v-if="false" label="主键" align="center" prop="planId"/>
|
|
|
|
<el-table-column v-if="false" label="主键" align="center" prop="planId"/>
|
|
|
|
<el-table-column width="150" label="计划编码" align="center" prop="planCode" fixed/>
|
|
|
|
<el-table-column width="150" label="计划编码" align="center" prop="planCode" fixed/>
|
|
|
|
<el-table-column width="150" label="计划名称" align="center" prop="planName"/>
|
|
|
|
<el-table-column width="150" label="计划名称" align="center" prop="planName"/>
|
|
|
|
|
|
|
|
<el-table-column width="150" label="生成规则" align="center" prop="calculationRule">
|
|
|
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
|
|
|
{{ scope.row.calculationRule == "0" ? "按照固定周期" : scope.row.one == "1" ? "按照上次保养时间" : "单次" }}
|
|
|
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="车间编码" align="center" prop="planWorkshop"/>
|
|
|
|
<el-table-column label="车间编码" align="center" prop="planWorkshop"/>
|
|
|
|
<el-table-column width="150" label="车间" align="center" prop="workCenterName"/>
|
|
|
|
<el-table-column width="150" label="车间" align="center" prop="workCenterName"/>
|
|
|
|
<el-table-column v-if="false" label="产线" align="center" prop="planProdLine"/>
|
|
|
|
<el-table-column v-if="false" label="产线" align="center" prop="planProdLine"/>
|
|
|
@ -468,6 +473,7 @@
|
|
|
|
<el-date-picker
|
|
|
|
<el-date-picker
|
|
|
|
v-model="form.planLoopStart"
|
|
|
|
v-model="form.planLoopStart"
|
|
|
|
type="date"
|
|
|
|
type="date"
|
|
|
|
|
|
|
|
value-format="yyyy-MM-dd"
|
|
|
|
placeholder="选择日期">
|
|
|
|
placeholder="选择日期">
|
|
|
|
</el-date-picker>
|
|
|
|
</el-date-picker>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
@ -1461,7 +1467,7 @@ export default {
|
|
|
|
// 获取设备组线信息
|
|
|
|
// 获取设备组线信息
|
|
|
|
getGroupLine().then(response => {
|
|
|
|
getGroupLine().then(response => {
|
|
|
|
this.groupLineList = response.data;
|
|
|
|
this.groupLineList = response.data;
|
|
|
|
this.equipmentQuery.groupLine = response.data[0].equipmentCode;
|
|
|
|
// this.equipmentQuery.groupLine = response.data[0].equipmentCode;
|
|
|
|
this.getEquList();
|
|
|
|
this.getEquList();
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
@ -1696,6 +1702,10 @@ export default {
|
|
|
|
return
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if(this.form.calculationRule == "2"){
|
|
|
|
|
|
|
|
this.form.planTimeArray = null;
|
|
|
|
|
|
|
|
this.form.planLoopEnd = this.form.planLoopStart;
|
|
|
|
|
|
|
|
}
|
|
|
|
this.planLoading = true;
|
|
|
|
this.planLoading = true;
|
|
|
|
if (this.form.planId != null) {
|
|
|
|
if (this.form.planId != null) {
|
|
|
|
this.form.personList = this.selectPersonList.map(item => {
|
|
|
|
this.form.personList = this.selectPersonList.map(item => {
|
|
|
|