增加新编程序统计；固化程序统计

yangys

2025-09-07 5bdb2202cfeccf25f947689f07c80431000ad615

增加新编程序统计；固化程序统计

 src/api/statreport/curedprogram.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
/*

 * @Date: 2025-08-24 22:38:05
 * @LastEditors: yangys
 * @LastEditTime: 2025-08-24 08:32:12
 * @FilePath: /mdmweb/src/api/flowmgr/exceptiontask.js
 */
import request from '@/axios';
export const getList = (current, size, params) => {
  return request({
    url: '/blade-mdm/statreport/cureprogram/page',
    method: 'get',
    params: {
      ...params,
      current,
      size,
    },
  })
};

 src/api/statreport/newprogramming.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,25 @@
/*
 * @Date: 2025-08-24 22:38:05
 * @LastEditors: yangys
 * @LastEditTime: 2025-08-24 08:32:12
 * @FilePath: /mdmweb/src/api/flowmgr/exceptiontask.js
 */
import request from '@/axios';
export const getList = (current, size, params) => {
  return request({
    url: '/blade-mdm/statreport/newprogramming/page',
    method: 'get',
    params: {
      ...params,
      current,
      size,
    },
  })
};

export const getDeptData = () => {
  return request({
    url: '/blade-mdm/statreport/newprogramming/deptsData',
    method: 'get'
  })
};

 src/views/flow/components/TodolistLeft.vue

@@ -8,7 +8,11 @@
    <basic-container>
        <!--'cureProgramTask', å›ºåŒ–编制不能添加文件-->
        <div class="tool" v-show="['programmingTask', 'replaceProgrammingTask','appendProgrammingTask'].includes(row.taskDefinitionKey)">
            <el-button type="primary" plain @click="addApp">添加文件
           
            <!--无固化的情况才显示该开关-->
            <el-switch v-if="row.variables.hasCuredProgram!=='Y'" v-model="programOnMachine" active-text="现场编制" inactive-text="工艺员编制" />
            &nbsp;
            <el-button type="primary" :disabled="programOnMachine" plain @click="addApp">添加文件
            </el-button>
        </div>
         <el-text type="danger" v-if="row.variables.curedLocked === 'Y'">固化程序已锁定，请谨慎使用。锁定原因：{{ remark }}</el-text>
@@ -16,6 +20,7 @@
         <el-text type="primary" v-if="row.processDefinitionKey === 'program-unlock'"><br/>解锁原因：</el-text>
         <el-text type="warning">{{row.variables.unlockReason}}</el-text>
         <el-text type="danger" v-if="row.variables.hasCuredProgram==='Y' && row.variables.isProcessEditionSame=='N' && row.variables.cureProgramUseable==undefined">已固化程序工序版次不一致，派工版次:{{row.variables.processEdition}},已固化版次：{{row.variables.curedProcessEdition}}</el-text>
         <el-text type="danger" v-if="row.variables.programOnMachine=='Y'">现场编制</el-text>
        <el-table :data="tableData" border @row-click="showContent" :row-style="{height:'20px'}" :cell-style="{padding:'0px'}" max-height="240" highlight-current-row>
            <!-- <el-table-column prop="machineCode" label="加工机床">
            </el-table-column> -->
@@ -113,6 +118,7 @@
            codeDiffFileName1: '回传版本',
            codeDiffFileName2: '下发版本',
            showContentId: '',
            programOnMachine:false,//是否现场编制
            attForm: {
                att: '',
                fileType: 'program'

 src/views/flow/todolist.vue

@@ -26,7 +26,7 @@
        <el-drawer title="审批" append-to-body v-model="approveBox" size="100%" v-if="approveBox">
            <div class="approve-box">
                <div class="left">
                    <TodolistLeft :row="row" @selection-change="selectionChange" />
                    <TodolistLeft ref="todolistLeft" :row="row" @selection-change="selectionChange" />
                </div>
                <div class="right">
                    <TodolistRightTop :row="row" />
@@ -97,24 +97,7 @@
                            { label: '驳回', value: 'N' },
                        ],
                        rules: [{ required: true, message: '请选择审批结果', trigger: 'blur' }],
                    },/*
                    {
                        label: '发送给',
                        prop: 'assignee',
                        type: 'select',
                        props: {
                            label: 'name',
                            value: 'id',
                        },
                        display: true,
                        filterable: true,
                        span: 24,
                        disabled: false,
                        dicData: [

                        ],
                       
                    },*/
                    },
                    {
                        label: '发送给',
                        prop: 'assignee',
@@ -137,7 +120,6 @@
                        span: 24,
                        prop: 'comment',
                        type: 'textarea',
                        // rules: [{ required: true, message: '请输入审批意见', trigger: 'blur' }],
                        rules: [
                            {
                            validator: (rule, value, callback) => {
@@ -783,17 +765,20 @@
            //console.log('handleAction', row, index);
        },
        handleSubmit(form, done) {
            if(this.row.taskDefinitionKey === 'programmingTask') {
                // if(this.applist.length !== 1) {
                //     done();
                //     return this.$message.success('请选择1个程序');
                // }
            
            
            //this.$alert(this.$refs.todolistLeft.programOnMachine)
            //done();
            //return;
            let programOnMachine = 'N'
            if(this.row.taskDefinitionKey==='programmingTask'){
                programOnMachine = this.$refs.todolistLeft.programOnMachine?'Y':'N';
            }
            approve({
                ...this.formApprove,
                taskId: this.row.taskId,
                processInstanceId: this.row.processInstanceId,
                // programIds: this.row.taskDefinitionKey === 'programmingTask' ? this.applist.map(v => v.id).join(',') : '',
                programOnMachine: programOnMachine
            }).then(res => {
                if(res.data.code !== 200) {
                    this.$message.error(res.data.msg);

 src/views/statreport/curedprogram.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,226 @@
<!--

 * @Date: 2025-06-18 09:17:09
 * @LastEditors: gaoshp
 * @LastEditTime: 2025-08-17 08:46:49
 * @FilePath: /mdmweb/src/views/flowmgr/processQuery2.vue
-->
<template>
    <basic-container>
        <avue-crud :option="option" :table-loading="loading" :search="query" :data="data" :rowKey="processInstanceId" v-model:page="page" ref="crud"
            @search-change="searchChange" @search-reset="searchReset" @current-change="currentChange"
            @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad"
            @selection-change="selectionChange">
        </avue-crud>

    </basic-container>
</template>

<script>
import { getList } from '@/api/statreport/curedprogram.js';
import { getDeptData} from '@/api/statreport/newprogramming.js';
import { exportBlobPost } from '@/api/common';
import NProgress from 'nprogress';
import { downloadFile } from '@/utils/util';
import 'nprogress/nprogress.css';

export default {
    data() {
        return {
            viewRow: {},
            page: {
                pageSize: 10,
                currentPage: 1,
                total: 0,
            },
            //form: {endMonth:'2025-08'},
            query: {endMonth: this.$dayjs().format('YYYY-MM-DD')},
            loading: true,
            data: [],
            option: {
                addBtn: false,
                editBtn: false,
                delBtn: false,
                viewBtn: false,
                columnBtn: false,
                tip: false,
                searchShow: true,
                searchMenuSpan: 7,
                searchEnter:true,
                dialogWidth: '70%',
                // tree: true,
                border: true,
                index: true,
                selection: false,
                //menuWidth: 100,
                menu: false,
                labelWidth: 90,
                //menuSpan: 6,
                dialogClickModal: false,
                column: [
                    
                    {
                        label: "月份",
                        prop: "endMonth",
                        search: true,
                        type: "month",
                        hide:true,
                        valueFormat: 'YYYY-MM-DD'
                    },
                    {
                        label: "部门",
                        prop: "deptIds",
                        search: true,
                        type: "select",
                        multiple:true,
                        hide:true,
                        disabled:true,
                        dicData:[{label:'a',value:1}]
                    },
                    
                     {
                        label: '零组件号',
                        prop: 'drawingNo',
                        width: 160
                    },
                    {
                        label: '工序号',
                        prop: 'processNo',
                        width: 80
                    },
                    {
                        label: '工序版次',
                        prop: 'processEdition',
                        width: 83
                    },
                   
                    {
                        label: '产品型号',
                        prop: 'productModel',
                        width: 100
                    },
                    {
                        label: '机床',
                        prop: 'machineCode',
                        width: 200
                    },
                    {
                        label: '编制',
                        prop: 'actProgrammerName',
                    },
                    {
                        label: '校对',
                        prop: 'actCheckerName',
                    },
                    {
                        label: '审核',
                        prop: 'actSeniorName',
                    },
                    {
                        label: '审核时间',
                        prop: 'endTime',
                    },
                ],
            },
            
            selectedList: [],
            dialogVisible: false,
           
        }
    },
    mounted() {
        getDeptData().then(res => {
            this.option.column[1].dicData = res.data.data;
        }, () => {
            this.data = [];
        }).catch(err => {
            this.data = [];
        });
    
    },
    methods: {
        
        selectionChange(list) {
            console.log('selectionChange', list);
            this.selectedList = list;
        },
        
        searchChange(params, done) {
            let data = {}
            this.query = params;
            this.page.currentPage = 1;
            params.createTimeBegin = params?.createTime?.[0] || '';
            params.createTimeEnd = params?.createTime?.[1] || '';
            console.log(params);
            data = {
                endMonth: params.endMonth,
                createTimeBegin: params.createTimeBegin || undefined,
                createTimeEnd: params.createTimeEnd || undefined,
                deptIds: params.deptIds,
                myProcessName: params.myProcessName || undefined
            }
            this.query = data
            this.onLoad(this.page, data);
            done();
        },
        searchReset() {
            let data = {}
            this.query = data;
            this.page.currentPage = 1;
            data = {
                endMonth: params.endMonth,
                createTimeBegin: params.createTimeBegin,
                createTimeEnd: params.createTimeEnd,
                keyword: params.keyword || '',
                myProcessName: params.myProcessName || ''
            }
            this.onLoad(this.page, data);
            done();
        },
        currentChange(currentPage) {
            this.page.currentPage = currentPage;
            // this.onLoad();
        },
        sizeChange(pageSize) {
            this.page.pageSize = pageSize;
        },
        refreshChange() {
            this.onLoad(this.page, this.query);
        },
        /** * é¡µé¢åŠ è½½æ—¶èŽ·å–数据
         */
        onLoad(page, params = {}) {
            console.log('onLoad', page, params);
            const data = {
                ...this.query,
                deptIds: params.deptIds,
                createTimeBegin: params.createTimeBegin,
                createTimeEnd: params.createTimeEnd,
            };
            this.loading = true;
            getList(page.currentPage, page.pageSize, Object.assign(data, params)).then(res => {
                const data = res.data.data
                this.page.total = data.total;
                this.data = data.records.map(v=> {
                    return {
                        ...v,
                    }
                });
                this.loading = false;
            }, () => {
                this.data = [];
                this.loading = false;
            }).catch(err => {
                this.data = [];
                this.loading = false;
            });
        }
    }
};
</script>

<style lang="scss">
.margin0 {
    margin: 0
}
</style>

 src/views/statreport/newprogramming.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,240 @@
<!--

 * @Date: 2025-06-18 09:17:09
 * @LastEditors: gaoshp
 * @LastEditTime: 2025-08-17 08:46:49
 * @FilePath: /mdmweb/src/views/flowmgr/processQuery2.vue
-->
<template>
    <basic-container>
        <avue-crud :option="option" :table-loading="loading" :search="query" :data="data" v-model:page="page" ref="crud"
            @search-change="searchChange" @search-reset="searchReset" @current-change="currentChange"
            @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad"
            @selection-change="selectionChange">
            <!--v-model:search="search"
            <template #search="{ size }">
                <el-tag>标题</el-tag>
                <el-input placeholder="自定义输入框"
                            :size="size"
                            style="width: 200px"
                            v-model:value="search.slot"></el-input>
            </template> -->
        </avue-crud>

    </basic-container>
</template>

<script>
import { getList ,getDeptData} from '@/api/statreport/newprogramming.js';

import { exportBlobPost } from '@/api/common';
import NProgress from 'nprogress';
import { downloadFile } from '@/utils/util';
import 'nprogress/nprogress.css';

export default {
    data() {
        return {
            //search:{}, è‡ªå®šä¹‰é‡‡ç”¨
            //tableData: [],
            viewRow: {},
            page: {
                pageSize: 10,
                currentPage: 1,
                total: 0,
            },
            //form: {endMonth:'2025-08'},
            query: {endMonth: this.$dayjs().format('YYYY-MM-DD')},
            loading: true,
            data: [],
            option: {
                addBtn: false,
                editBtn: false,
                delBtn: false,
                viewBtn: false,
                columnBtn: false,
                tip: false,
                searchShow: true,
                searchMenuSpan: 7,
                searchEnter:true,
                dialogWidth: '70%',
                // tree: true,
                border: true,
                index: true,
                selection: false,
                //menuWidth: 100,
                menu: false,
                labelWidth: 90,
                //menuSpan: 6,
                dialogClickModal: false,
                column: [
                    
                    {
                        label: "月份",
                        prop: "endMonth",
                        search: true,
                        type: "month",
                        hide:true,
                        valueFormat: 'YYYY-MM-DD'
                    },
                    {
                        label: "部门",
                        prop: "deptIds",
                        search: true,
                        type: "select",
                        multiple:true,
                        hide:true,
                        disabled:true,
                        dicData:[{label:'a',value:1}]
                    },
                     {
                        label: '零组件号',
                        prop: 'drawingNo',
                        width: 160
                    },
                    {
                        label: '工序号',
                        prop: 'processNo',
                        width: 80
                    },
                    {
                        label: '工序版次',
                        prop: 'processEdition',
                        width: 83
                    },
                   
                    {
                        label: '产品型号',
                        prop: 'productModel',
                        width: 100
                    },
                    {
                        label: '机床',
                        prop: 'machineCode',
                        width: 200
                    },
                    {
                        label: '编制',
                        prop: 'actProgrammerName',
                    },
                    {
                        label: '校对',
                        prop: 'actCheckerName',
                    },
                    {
                        label: '审核',
                        prop: 'actSeniorName',
                    },
                    {
                        label: '审核时间',
                        prop: 'endTime',
                    },
                ],
            },
            
            selectedList: [],
            dialogVisible: false,
           
        }
    },
    mounted() {
        //this.option.column[0].disabled = true;
        //this.option.column[0].value = '2025-08-31';
        
        getDeptData().then(res => {
            this.option.column[1].dicData = res.data.data;
        }, () => {
            this.data = [];
        }).catch(err => {
            this.data = [];
        });
    
    },
    methods: {
        
        
        selectionChange(list) {
            console.log('selectionChange', list);
            this.selectedList = list;
        },
        
        searchChange(params, done) {
            let data = {}
            this.query = params;
            this.page.currentPage = 1;
            console.log('searchChange', params);
            params.createTimeBegin = params?.createTime?.[0] || '';
            params.createTimeEnd = params?.createTime?.[1] || '';
            console.log(params);
            data = {
                endMonth: params.endMonth,
                createTimeBegin: params.createTimeBegin || undefined,
                createTimeEnd: params.createTimeEnd || undefined,
                deptIds: params.deptIds,
                myProcessName: params.myProcessName || undefined
            }
            this.query = data
            this.onLoad(this.page, data);
            done();
        },
        searchReset() {
            let data = {}
            this.query = data;
            this.page.currentPage = 1;
            data = {
                endMonth: params.endMonth,
                createTimeBegin: params.createTimeBegin,
                createTimeEnd: params.createTimeEnd,
                keyword: params.keyword || '',
                myProcessName: params.myProcessName || ''
            }
            this.onLoad(this.page, data);
            done();
        },
        currentChange(currentPage) {
            this.page.currentPage = currentPage;
            // this.onLoad();
        },
        sizeChange(pageSize) {
            this.page.pageSize = pageSize;
        },
        refreshChange() {
            this.onLoad(this.page, this.query);
        },
        /** * é¡µé¢åŠ è½½æ—¶èŽ·å–数据
         */
        onLoad(page, params = {}) {
            console.log('onLoad', page, params);
            const data = {
                ...this.query,
                deptIds: params.deptIds,
                createTimeBegin: params.createTimeBegin,
                createTimeEnd: params.createTimeEnd,
            };
            this.loading = true;
            getList(page.currentPage, page.pageSize, Object.assign(data, params)).then(res => {
                const data = res.data.data
                this.page.total = data.total;
                this.data = data.records.map(v=> {
                    return {
                        ...v,
                    }
                });
                this.loading = false;
            }, () => {
                this.data = [];
                this.loading = false;
            }).catch(err => {
                this.data = [];
                this.loading = false;
            });
        }
    }
};
</script>

<style lang="scss">
.margin0 {
    margin: 0
}
</style>