重构机床回传文件；撤回后禁用撤回按钮

yangys

2025-08-30 b0d0a643150edb5064e8c61d941d908bad805675

重构机床回传文件；撤回后禁用撤回按钮

 src/api/tasks/machinereturnfileop.js

@@ -7,7 +7,7 @@
import request from '@/axios';
export const getList = (current, size, params) => {
  return request({
    url: '/blade-mdm/machineback/filehandle/page',
    url: '/blade-mdm/machinefile/filehandle/page',
    method: 'get',
    params: {
      ...params,

 src/views/flow/components/TodolistLeft.vue

@@ -217,13 +217,15 @@
            if(!nodeId){
                nodeId = this.row.variables.curedNodeId;
            }
            queryLockRemark(nodeId).then(res => {
                if (res.data.code == 200) {
                    this.remark = res.data.data || '';
                } else {
                    this.remark = '';
                }
            })
            if(nodeId){
                queryLockRemark(nodeId).then(res => {
                    if (res.data.code == 200) {
                        this.remark = res.data.data || '';
                    } else {
                        this.remark = '';
                    }
                });
            }
        },
        diffFile(index, row) {
            console.log(row)

 src/views/flow/donelist.vue

@@ -11,7 +11,7 @@
            @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad" >
            <template #menu="scope">
                <el-button type="primary" text size="default" @click.stop="handleView(scope.row, scope.index)">查看</el-button>
                <el-button type="primary" :disabled="scope.row.processIsFinished==='true'" v-if="permission.withdraw_button" text size="default" @click.stop="handleWithdraw(scope.row, scope.index)">撤回</el-button>
                <el-button type="primary" :disabled="scope.row.processIsFinished==='true' || scope.row.flag.toLowerCase().indexOf('program')>-1" v-if="permission.withdraw_button" text size="default" @click.stop="handleWithdraw(scope.row, scope.index)">撤回</el-button>
            </template>
            
        </avue-crud>
@@ -350,15 +350,17 @@
                            return;
                        }
                        this.$message.success('操作成功');
                        
                        this.refreshChange();
                    }).catch(err => {
                        console.error(err);
                        done()
                        //done()
                    });
                    
                }).catch(() => {
                    console.log('>>>>>>')
                    // this.$message.info('已取消操作');
                    done();
                    //done();
                });
        },
        currentChange(currentPage) {
@@ -371,7 +373,7 @@
            console.log('searchChange', params);
            params.createTimeBegin = params?.processCreateTime?.[0] || '';
            params.createTimeEnd = params?.processCreateTime?.[1] || '';
            console.log(params);
            //console.log(params);
            // data = {
            //     createTimeBegin: dayjs(params.createTimeBegin).isValid() ? dayjs(params.createTimeBegin).format('YYYY-MM-DD') : '',
            //     createTimeEnd: dayjs(params.createTimeEnd).isValid() ? dayjs(params.createTimeEnd).format('YYYY-MM-DD') : '',
@@ -384,7 +386,7 @@
            }
            this.query = data
            this.onLoad(this.page, data);
            done();
            //done();
        },
        searchReset () {
            this.loading = true;
@@ -393,7 +395,7 @@
        },
        sizeChange() {
            this.loading = true;
        this.getList(); 
            this.getList(); 
        },
        refreshChange() {
            this.onLoad(this.page, this.query);

 src/views/tasks/machinereturnfileop.vue

@@ -71,18 +71,30 @@
                        label: '回传机床',
                        prop: 'machineCode',
                    },

                    
                    {
                        label: '文件固化状态',
                        prop: 'isCured',
                        formatter: (val, value, label) => {
                            return `${val==0?'未固化':"已固化"}`;
                        },
                        label: '程序状态',
                        prop: 'programStatus',
                        render: ({ row,value }) => {
                            var txt = '未知';
                            switch(row.programStatus){
                                case 1:
                                txt = '试切';
                                break;
                                case 2:
                                txt = '固化';
                                break;
                                case 3:
                                txt = '偏离';
                                break;
                                default:
                                txt = '未知';
                            }
                            return txt;
                        }
                    },
                    {
                        label: '文件到达时间',
                        prop: 'arrivedTime',
                        prop: 'fileCreateTime',
                        type: 'datetime',
                        format: 'YYYY-MM-DD HH:mm:ss',
                        valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -126,7 +138,7 @@
            }).then(() => {
                NProgress.start();
                exportBlob(
                    `/blade-mdm/machineback/filehandle/export-to-inner`,
                    `/blade-mdm/machinefile/filehandle/export-to-inner`,
                    {
                        ids: this.selectedList.map(item => item.id).join(','),
                    }
@@ -148,7 +160,7 @@
            }).then(() => {
                NProgress.start();
                exportBlob(
                    `/blade-mdm/machineback/filehandle/export-excel?${this.website.tokenHeader}=${getToken()}`
                    `/blade-mdm/machinefile/filehandle/export-excel?${this.website.tokenHeader}=${getToken()}`
                ).then(res => {
                    downloadXls(res.data, `机床回传程序列表${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.xlsx`);
                    NProgress.done();

 src/views/tasks/machinereturnfiles.vue

@@ -23,11 +23,13 @@
    >
      <template #menu-left>
        <!-- el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleExport">导出</el-button> -->
        <el-button type="primary" :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'" size="default" icon="el-icon-circle-plus" plain @click="receiveAll">全部接收</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="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==='REC'" 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==='REC'" text size="default" icon="el-icon-document-add" @click.stop="acceptBtn(scope.row, scope.index)">接收</el-button>
        <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>
@@ -36,9 +38,10 @@
</template>

<script>
  import { ElMessage } from 'element-plus';
import { ElMessage } from 'element-plus';
import { exportBlob } from '@/api/common';
import { downloadXls } from '@/utils/util';
import { downloadXls ,getQueryString} from '@/utils/util';

import { getToken } from '@/utils/auth';
import NProgress from 'nprogress';
import 'nprogress/nprogress.css';
@@ -48,7 +51,8 @@
      selection: [],
      search: {
        keyword: "",
        machineGroupCode: ""
        machineGroupCode: "",
        dirType:"",
      },
      loading: true,
      treeData: [],
@@ -73,13 +77,9 @@
        emptyBtn: false,
        searchLabelWidth: "120",
        searchSpan: 8,
        menuWidth: 150,
        column: [
          {
            label: '任务编码',
            prop: 'programName',
            hide: true
          },
          {
            {
            label: '文件名称',
            prop: 'name',
          },
@@ -87,14 +87,34 @@
            label: '机床号',
            prop: 'machineCode',
          },
          
          {
            label: '文件固化状态',
            prop: 'isCured',
            label: '程序状态',
            prop: 'programStatus',
            render: ({ row,value }) => {
              var txt = '未知';
              switch(row.programStatus){
                case 1:
                  txt = '试切';
                  break;
                case 2:
                  txt = '固化';
                  break;
                case 3:
                  txt = '偏离';
                  break;
                default:
                  txt = '未知';
              }
              return txt;
            }
          },
          {
            label: '文件大小',
            prop: 'fileSizeDisplay',
          },
          {
            label: '文件到达时间',
            prop: 'arrivedTime',
            prop: 'fileCreateTime',
          },/*
          {
            label: '文件数据库编号',
@@ -128,6 +148,29 @@
    selectionChange(selection) {
      this.selection = selection;
    },

    receiveAll() {
      //接收符合条件的所有数据
      this.$confirm('确定要接收符合条件的所有文件吗?', {  //同接收接口相同
        confirmButtonText: '是',
        cancelButtonText: '否',
        type: 'warning',
      }).then(() => {
        //调用接口
        this.loading = true;
        axios({
          url: '/blade-mdm/machinefile/file/temp-accept-all',
          method: 'post',
          params: {}
        }).then(
          res => {
            this.loading = false;
            this.onLoad();
          }
        );
      })
    },

    receiveBtn() {
      if(this.selection.length == 0) {
        ElMessage({message: '请选择数据',type: 'error'})
@@ -144,7 +187,7 @@
        //调用接口
        this.loading = true;
        axios({
          url: '/blade-mdm/machineback/file/accept',
          url: '/blade-mdm/machinefile/collect/temp-accept',
          method: 'post',
          params: {ids: ids.join(',')},
        }).then(
@@ -164,7 +207,7 @@
        //调用接口
        this.loading = true;
        axios({
          url: '/blade-mdm/machineback/file/accept',
          url: '/blade-mdm/machinefile/collect/temp-accept',
          method: 'post',
          params: {ids: row.id},
        }).then(
@@ -184,7 +227,7 @@
        //调用接口
        this.loading = true;
        axios({
          url: '/blade-mdm/machineback/file/reject',
          url: '/blade-mdm/machinefile/collect/temp-reject',
          method: 'post',
          params: {ids: row.id},
        }).then(
@@ -203,7 +246,7 @@
      }).then(() => {
        NProgress.start();
        exportBlob(
          `/blade-mdm/machineback/file/export-excel?${this.website.tokenHeader}=${getToken()}`
          `/blade-mdm/machinefile/file/export-excel?${this.website.tokenHeader}=${getToken()}`
        ).then(res => {
          downloadXls(res.data, `机床回传文件数据${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.xlsx`);
          NProgress.done();
@@ -240,7 +283,7 @@
        machineCode: this.currentNode.machineCode,
      }
      axios({
        url: '/blade-mdm/machineback/file/page',
        url: '/blade-mdm/machinefile/collect/file-page-for-acceept',
        method: 'get',
        params: obj,
      }).then(
@@ -259,13 +302,12 @@
    handleNodeClick(treeNode,b,c,d) {
      console.log(treeNode)
      this.currentNode = treeNode;
      this.search.dirType = treeNode.dirType;
      this.onLoad();
      //this.fileName = "";
      //this.searchTable(TreeNode);
    },
    treeLoad () {
      axios({
        url: '/blade-mdm/gkw/node/load-tree',
        url: '/blade-mdm/gkw/node/load-tree?includeSend=0',
        method: 'get',
      }).then(
        res => {
@@ -284,6 +326,7 @@
  },
  mounted() {
    this.treeLoad();
    this.search.dirType = getQueryString("dirType");
  }
};
</script>

 src/views/wel/gongkong.vue

@@ -246,11 +246,12 @@
    },
    sizeChange(size) {
      this.size = size;
      this.treeLoad(this.TreeNode);
      this.searchTable(this.TreeNode);
    },
    currentChange(current) {
      //console.log('curr',current)
      this.current = current;
      this.treeLoad();
      this.searchTable();
    },
    handleNodeClick(TreeNode,b,c,d) {
      this.fileName = "";
@@ -258,13 +259,12 @@
    },
    searchTable(TreeNode) {
      this.TreeNode = {...TreeNode};
      
      var obj = {
        name: this.fileName,
        dirType: TreeNode.dirType,
        nodeType: TreeNode.nodeType, 
        nodeId: TreeNode.nodeType!='dir'?TreeNode.id:undefined,
        machineCode: TreeNode.machineCode,
        dirType: this.TreeNode.dirType,
        nodeType: this.TreeNode.nodeType, 
        nodeId: this.TreeNode.nodeType!='dir'?this.TreeNode.id:undefined,
        machineCode: this.TreeNode.machineCode,
        current: this.current,
        size: this.size
      }
@@ -315,7 +315,7 @@
        this.dataHis = [];
        this.loadingHis = false;
      }).catch(err => {
        console.log(err)
        //console.log(err)
        this.dataHis = [];
        this.loadingHis = false;
      });
@@ -323,6 +323,9 @@
  },
  mounted() {
    this.treeLoad();
  },
  created(){
    this.searchTable({});
  }
};
</script>