补充确认表，审批表模板字段；界面优化

yangys

2025-09-09 bb0a24ce08ce6bba47423210d40148872327cabd

补充确认表，审批表模板字段；界面优化

 src/views/statreport/approveTablePrint.vue

@@ -63,6 +63,8 @@
                menuWidth: 140,
                menu: true,
                dialogClickModal: false,
                height:'auto',
                calcHeight:170,
                column: [
                    
                    {

 src/views/statreport/curedprogram.vue

@@ -117,7 +117,7 @@
                        prop: 'actSeniorName',
                    },
                    {
                        label: '审核时间',
                        label: '审核结束时间',
                        prop: 'endTime',
                    },
                ],

 src/views/statreport/taskdispatchreport.vue

@@ -9,7 +9,7 @@
    <basic-container>
        <avue-crud :option="option" :table-loading="loading" :data="data" v-model:page="page" v-model="form" ref="crud"
            @search-change="searchChange" @search-reset="searchReset" @current-change="currentChange"
            @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad" @selection-change="selectionChange">
            @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
            
        </avue-crud>
    </basic-container>
@@ -68,6 +68,16 @@
                        label: '工序版次',
                        prop: 'processEdition'
                    },
                    {
                        label: '创建时间',
                        prop: 'createTime',
                        type: 'datetime',
                        showOverflowTooltip:true,
                        width: 155,
                        search: false,
                        searchSpan: 8,
                        hide: false,
                    },
                    {
                        label: '创建时间',
                        prop: 'createTime',
@@ -79,32 +89,42 @@
                        search: true,
                        searchRange: true,
                        searchSpan: 8,
                        hide: false,
                        hide: true,
                    },
                    {
                        label: '是否固化',
                        prop: 'cureTime',
                        label: '程序状态',
                        prop: 'status',
                        width: 85,
                        render: ({ row }) => {
                            return row.cureTime?'已固化':'未固化';
                            let txt = '';
                            switch(row.status){
                                case 1:
                                    txt = '试切中'
                                    break;
                                case 2:
                                    txt = '固化中';
                                    break;
                                default:
                                    txt = '已固化';
                                
                            }
                            return txt;
                        },
                    },
                    {
                        label: '固化时间',
                        prop: 'cureTime'
                    },
                    {
                        label: '机床',
                        prop: 'machineCode'
                    }
                ],
                selection: [],
            },

            selection: [],
        }
    },
    methods: {
        selectionChange (list) {
            this.selection = list;
        },
        
       
        handleExport(row,index) {
            //审批表下载
            this.$confirm('是否导出审批表?', '提示', {

 src/views/tasks/machinereturnfiles.vue

@@ -1,6 +1,6 @@
<template>
  <div class="gongkongMain">
  <div>
  <div >
      <el-tree :data="treeData" :props="defaultProps" node-key="id" :default-expand-all="false" :default-expanded-keys="defaultKeys" @node-click="handleNodeClick" />
    </div>
    <div>
@@ -27,10 +27,12 @@
        <el-button type="primary" v-if="this.search.dirType!='REC'" :disabled="this.selection.length==0" size="default" icon="el-icon-circle-plus" plain @click="receiveBtn">接收已选</el-button>
        <el-button type="primary" v-if="this.search.dirType!='REC'" :disabled="this.selection.length==0" size="default" icon="el-icon-circle-plus" plain @click="rejectBtn">拒绝</el-button>
      </template>
      <!--
      <template #menu="scope">
        <el-button type="primary" v-if="scope.row.dirType==='TEMP'" text size="default" icon="el-icon-document-delete" @click.stop="rejectBtn(scope.row, scope.index)">拒绝</el-button>
        <el-button type="primary" v-if="scope.row.dirType==='TEMP'" text size="default" icon="el-icon-document-add" @click.stop="acceptBtn(scope.row, scope.index)">接收</el-button>
      </template>
      -->
    </avue-crud>
  </basic-container>
  </div>
@@ -68,8 +70,10 @@
        total: 0,
      },
      option: {
        size:'mini',
        index: true,
        selection: true,
        selectionWidth:20,
        addBtn: false,
        editBtn: false,
        delBtn: false,
@@ -77,19 +81,23 @@
        emptyBtn: false,
        searchLabelWidth: "120",
        searchSpan: 8,
        menuWidth: 150,
        menu:false,
        width:'100%',
        column: [
            {
            label: '文件名称',
            prop: 'name',
            showOverflowTooltip:true,
          },
          {
            label: '机床号',
            prop: 'machineCode',
            showOverflowTooltip:true,
          },
          {
            label: '程序状态',
            prop: 'programStatus',
            showOverflowTooltip:true,
            render: ({ row,value }) => {
              var txt = '未知';
              switch(row.programStatus){
@@ -114,6 +122,7 @@
          },
          {
            label: '文件到达时间',
            showOverflowTooltip:true,
            prop: 'fileCreateTime',
          },/*
          {
@@ -121,7 +130,7 @@
            prop: '',
          },*/
          {
            label: '关键信息',
            label: '关键字',
            prop: 'keyword',
            search: true,
            hide: true,
@@ -342,7 +351,7 @@
  }
}
.gongkongMain > div:nth-child(1) {
  width:25%;
  width:17%;
  border-right: 1px solid #ccc;
}
.gongkongMain div:nth-child(2) {
@@ -353,4 +362,15 @@
  display: flex;
  justify-content: flex-end;
}
/*
.Avue-crud{
  :deep(.el-table) {
    .el-table__body-wrapper,
    .el-table__fixed-body-wrapper {
      max-height:calc(100vh - 630px)!important;
      overflow-y: auto;
    }
  }
}
*/
</style>