mdmweb.git - Gitblit

			@@ -1,21 +1,21 @@
			<!--
			* @Date: 2025-06-18 09:17:09
			* @LastEditors: gaoshp
			* @LastEditTime: 2025-07-20 12:27:48
			* @LastEditTime: 2025-08-13 21:23:34
			* @FilePath: /mdmweb/src/views/tasks/machinereturnfileop.vue
			-->
			<template>
			<basic-container>
			<avue-crud :option="option" :table-loading="loading" :data="data" v-model:page="page" v-model="form" ref="crud"
			<avue-crud :option="option" :search="query" :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">
			<template #menu-left>
			<el-button type="primary" plain @click="exportWebSite">导出回传涉密网</el-button>
			<el-button type="primary" :disabled="this.selectedList.length==0" plain @click="exportWebSite">导出回传涉密网</el-button>
			<!--<el-button type="primary" plain @click="reassign">挂载车床程序库</el-button>-->
			<el-button type="primary" plain @click="exportExcel">导出到EXCEL</el-button>
			<el-button type="primary" :disabled="this.selectedList.length==0" plain @click="exportExcel">导出到EXCEL</el-button>
			</template>
			<template #menu="scope">
			<el-button type="primary" text size="default" v-if="permission.flow_model_update"
			<el-button type="primary" text size="default"
			@click.stop="handleAction(scope.row, scope.index)">审批
			</el-button>
			</template>
			@@ -40,7 +40,7 @@
			total: 0,
			},
			form: {},
			query: {},
			query: {status:1},
			loading: true,
			data: [],
			option: {
			@@ -65,31 +65,60 @@

			{
			label: '文件名称',
			prop: 'name'
			prop: 'name',
			search:true,
			},
			{
			label: '导出状态',
			prop: 'status',
			search:true,
			type:'select',
			dicData:[
			{
			label: '未导出',
			value:1
			},
			{
			label: '已导出',
			value:2
			}
			]
			},
			{
			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',
			},
			{
			label: '确认时间',
			prop: 'determineTime',
			prop: 'createTime',
			type: 'datetime',
			format: 'YYYY-MM-DD HH:mm:ss',
			valueFormat: 'YYYY-MM-DD HH:mm:ss',
			@@ -97,17 +126,17 @@
			searchRange: true,
			searchSpan: 8,
			hide: false,
			}/*,
			{
			label: '接收x时间',
			prop: 'determineTime',
			},
			{
			label: '导出时间',
			prop: 'exportTime',
			type: 'datetime',
			format: 'YYYY-MM-DD HH:mm:ss',
			valueFormat: 'YYYY-MM-DD HH:mm:ss',
			}*/
			}
			],
			selectedList: [],
			}
			},
			selectedList: [],
			}
			},
			methods: {
			@@ -126,12 +155,13 @@
			}).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(','),
			}
			).then(res => {
			downloadXls(res.data, `工控网回传程序${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.zip`);
			this.onLoad(this.page, {});
			NProgress.done();
			});
			});
			@@ -148,7 +178,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();
			@@ -160,17 +190,14 @@
			this.query = params;
			this.page.currentPage = 1;
			console.log('searchChange', params);
			params.confirmTimeBegin = params?.confirmTime?.[0] \|\| '';
			params.confirmTimeEnd = params?.confirmTime?.[1] \|\| '';
			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') : '',
			// keyword: params.keyword \|\| ''
			// }
			params.confirmTimeBegin = params?.determineTime?.[0] \|\| '';
			params.confirmTimeEnd = params?.determineTime?.[1] \|\| '';

			data = {
			confirmTimeBegin: params.confirmTimeBegin,
			confirmTimeEnd: params.confirmTimeEnd,
			name: params.name,
			status: this.query.status,
			}
			this.query = data
			this.onLoad(this.page, data);
			@@ -181,8 +208,8 @@
			this.query = params;
			this.page.currentPage = 1;
			data = {
			createTimeBegin: params.createTimeBegin,
			createTimeEnd: params.createTimeEnd,
			createTimeBegin: params.confirmTimeBegin,
			createTimeEnd: params.confirmTimeEnd,
			keyword: params.keyword \|\| ''
			}
			this.onLoad(this.page, data);
			@@ -204,7 +231,6 @@
			console.log('onLoad', page, params);
			const query = {
			...this.query,
			// category: params.category ? flowCategory(params.category) : null,
			mode: this.mode,
			};
			try {