update mes生产计划添加撤回

master
yinq 3 months ago
parent 2347ce2919
commit b85f4c3933

@ -189,16 +189,18 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label='备注' align='center' prop='remark' v-if='columns[31].visible' /> <el-table-column label='备注' align='center' prop='remark' v-if='columns[31].visible' />
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">--> <el-table-column label='操作' align='center' class-name='small-padding fixed-width' fixed='right'>
<!-- <template #default="scope">--> <template #default='scope'>
<!-- <el-tooltip content="修改" placement="top">--> <el-button link type='primary' @click='handleRecall(scope.row)'
<!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['mes:planInfo:edit']"></el-button>--> v-if='["0", "1"].includes(scope.row.planStatus)'
v-hasPermi="['mes:planInfo:edit']">撤回
</el-button>
<!-- <el-tooltip content='删除' placement='top'>-->
<!-- <el-button link type='primary' icon='Delete' @click='handleDelete(scope.row)'-->
<!-- v-hasPermi="['mes:planInfo:remove']"></el-button>-->
<!-- </el-tooltip>--> <!-- </el-tooltip>-->
<!-- <el-tooltip content="删除" placement="top">--> </template>
<!-- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['mes:planInfo:remove']"></el-button>--> </el-table-column>
<!-- </el-tooltip>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table> </el-table>
<pagination v-show='total > 0' :total='total' v-model:page='queryParams.pageNum' <pagination v-show='total > 0' :total='total' v-model:page='queryParams.pageNum'
@ -449,7 +451,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label='工序名称' prop='processId'> <el-form-item label='工序名称' prop='processId'>
<el-select v-model='form.processId' placeholder='请先选择工序,再选择机台' @change="getMachine"> <el-select v-model='form.processId' placeholder='请先选择工序,再选择机台' @change='getMachine'>
<el-option <el-option
v-for='item in processList' v-for='item in processList'
:key='item.processId' :key='item.processId'
@ -820,8 +822,9 @@ import {getProcessInfoList} from '@/api/mes/baseProcessInfo';
import { getStationInfoList } from '@/api/mes/baseStationInfo'; import { getStationInfoList } from '@/api/mes/baseStationInfo';
import { getProdBaseMachineInfoList } from '@/api/mes/prodBaseMachineInfo'; import { getProdBaseMachineInfoList } from '@/api/mes/prodBaseMachineInfo';
import { ProdBaseMachineInfoVO } from '@/api/mes/prodBaseMachineInfo/types'; import { ProdBaseMachineInfoVO } from '@/api/mes/prodBaseMachineInfo/types';
import {MaterialBomVO} from "@/api/mes/materialBom/types"; import { MaterialBomVO } from '@/api/mes/materialBom/types';
import {optionselect} from "@/api/system/post"; import { optionselect } from '@/api/system/post';
import { cloneDeep } from 'lodash-es';
const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { const {
@ -1162,6 +1165,19 @@ const handleUpdate = async (row?: PlanInfoVO) => {
dialog.title = '修改生产计划信息'; dialog.title = '修改生产计划信息';
}; };
/** 撤回按钮操作 */
const handleRecall = async (row?: PlanInfoVO) => {
buttonLoading.value = true;
let rowData = cloneDeep(row);
rowData.workshopId = workshopId.value;
rowData.planStatus = '4';
await proxy?.$modal.confirm('是否确认撤回计划编号为"' + row.planCode + '"的数据项?').finally(() => {
updatePlanInfo(rowData).finally(() => buttonLoading.value = false);
});
proxy?.$modal.msgSuccess('撤回成功');
await getList();
};
/** 提交按钮 */ /** 提交按钮 */
const submitForm = () => { const submitForm = () => {
planInfoFormRef.value?.validate(async (valid: boolean) => { planInfoFormRef.value?.validate(async (valid: boolean) => {
@ -1241,7 +1257,8 @@ const batchesAddAssemblyData = () => {
data.shiftId = '2'; data.shiftId = '2';
data.planAmount = formData.planAmount5; data.planAmount = formData.planAmount5;
data.materialId = formData.workshopId === '4' ? formData.materialIdR : formData.materialId; data.materialId = formData.workshopId === '4' ? formData.materialIdR : formData.materialId;
data.materialBomVersion = formData.workshopId === '4' ? formData.materialBomVersionR : formData.materialBomVersion; list.push(data); data.materialBomVersion = formData.workshopId === '4' ? formData.materialBomVersionR : formData.materialBomVersion;
list.push(data);
} }
if (formData.planAmount6 > 0) { if (formData.planAmount6 > 0) {
let data = { ...formData }; let data = { ...formData };
@ -1249,7 +1266,8 @@ const batchesAddAssemblyData = () => {
data.shiftId = '3'; data.shiftId = '3';
data.planAmount = formData.planAmount6; data.planAmount = formData.planAmount6;
data.materialId = formData.workshopId === '4' ? formData.materialIdR : formData.materialId; data.materialId = formData.workshopId === '4' ? formData.materialIdR : formData.materialId;
data.materialBomVersion = formData.workshopId === '4' ? formData.materialBomVersionR : formData.materialBomVersion; list.push(data); data.materialBomVersion = formData.workshopId === '4' ? formData.materialBomVersionR : formData.materialBomVersion;
list.push(data);
} }
return list; return list;
}; };
@ -1292,15 +1310,15 @@ const submitMaterialForm = () => {
if (modelCodeRef.value === 'L') { if (modelCodeRef.value === 'L') {
form.value.materialIdL = selectedRow.materialId; form.value.materialIdL = selectedRow.materialId;
form.value.materialNameL = selectedRow.materialName; form.value.materialNameL = selectedRow.materialName;
getMaterialBomVersionSelect('L') getMaterialBomVersionSelect('L');
} else if (modelCodeRef.value === 'R') { } else if (modelCodeRef.value === 'R') {
form.value.materialIdR = selectedRow.materialId; form.value.materialIdR = selectedRow.materialId;
form.value.materialNameR = selectedRow.materialName; form.value.materialNameR = selectedRow.materialName;
getMaterialBomVersionSelect('R') getMaterialBomVersionSelect('R');
} else { } else {
form.value.materialId = selectedRow.materialId; form.value.materialId = selectedRow.materialId;
form.value.materialName = selectedRow.materialName; form.value.materialName = selectedRow.materialName;
getMaterialBomVersionSelect('') getMaterialBomVersionSelect('');
} }
materialIdForm.value = selectedRow.materialId; materialIdForm.value = selectedRow.materialId;
materialOpen.value = false; materialOpen.value = false;
@ -1339,7 +1357,7 @@ function handleMachineQuery() {
} }
const getMachine = async () => { const getMachine = async () => {
console.log(form.value.processId) console.log(form.value.processId);
if (workshopId.value == 2 && form.value.processId != null) { if (workshopId.value == 2 && form.value.processId != null) {
await getReleaseSelect(); await getReleaseSelect();
} }

Loading…
Cancel
Save