1.生产管理联调

gaoluyang

16 小时以前 affb0876f58e628c31fee12cf8cf7e9f1748142c

1.生产管理联调

 src/views/productionManagement/operationScheduling/index.vue

@@ -15,9 +15,9 @@
                                                    placeholder="请选择" clearable @change="changeDaterange" />
                </el-form-item>
                <el-form-item label="状态:">
                    <el-select v-model="searchForm.status" placeholder="请选择状态" style="width: 140px" clearable>
                    <el-select v-model="searchForm.status" placeholder="请选择状态" @change="handleQuery" style="width: 140px" clearable>
                        <el-option label="待排产" :value="1"></el-option>
                        <el-option label="已排产" :value="0"></el-option>
                        <el-option label="已排产" :value="3"></el-option>
                        <el-option label="排产中" :value="2"></el-option>
                    </el-select>
                </el-form-item>
@@ -73,7 +73,7 @@
        prop: "status",
        dataType: "tag",
        formatData: (params) => {
            if (params == 0) {
            if (params == 3) {
                return "已排产";
            } else if (params == 1) {
                return "待排产";
@@ -82,7 +82,7 @@
            }
        },
        formatType: (params) => {
            if (params == 0) {
            if (params == 3) {
                return "success";
            } else if (params == 1) {
                return "primary";
@@ -220,6 +220,12 @@
const handleDelete = () => {
    let ids = [];
    if (selectedRows.value.length > 0) {
        // 新增：判断是否有已排产的数据
        const hasScheduled = selectedRows.value.some(item => item.status == 3);
        if (hasScheduled) {
            proxy.$modal.msgWarning("已排产数据不能取消排产");
            return;
        }
        ids = selectedRows.value.map((item) => item.id);
    } else {
        proxy.$modal.msgWarning("请选择数据");

 src/views/productionManagement/productionReporting/index.vue

@@ -17,7 +17,7 @@
                <el-form-item label="状态:">
                    <el-select v-model="searchForm.status" placeholder="请选择状态" style="width: 140px" clearable>
                        <el-option label="待生产" :value="1"></el-option>
                        <el-option label="已报工" :value="0"></el-option>
                        <el-option label="已报工" :value="3"></el-option>
                        <el-option label="生产中" :value="2"></el-option>
                    </el-select>
                </el-form-item>
@@ -109,6 +109,7 @@
                                    size="small"
                                    @click="changeEditType(scope.row)"
                                    v-if="!scope.row.editType"
                                    :disabled="scope.row.parentStatus === 3"
                                >编辑</el-button
                                >
                                <el-button
@@ -168,7 +169,7 @@
        prop: "status",
        dataType: "tag",
        formatData: (params) => {
            if (params == 0) {
            if (params == 3) {
                return "已报工";
            } else if (params == 1) {
                return "待生产";
@@ -177,7 +178,7 @@
            }
        },
        formatType: (params) => {
            if (params == 0) {
            if (params == 3) {
                return "success";
            } else if (params == 1) {
                return "primary";
@@ -314,7 +315,8 @@
                    if (index > -1) {
                        expandData.value = res.data.map(item => ({
                            ...item,
                            pendingNum: (Number(item.schedulingNum) || 0) - (Number(item.finishedNum) || 0)
                            pendingNum: (Number(item.schedulingNum) || 0) - (Number(item.finishedNum) || 0),
                            parentStatus: row.status // 新增父表状态
                        }));
                    }
                    expandedRowKeys.value.push(row.id);