-
+
+
+
施工机具设备出库检验记录表
-
-
+
+
+
+
+
+
-
领用工程：
{{ checkDataInfo.leaseProject }}
-
+
-
使用单位：
{{ checkDataInfo.leaseUnit }}
| 机具名称 | +规格型号 | +单位 | +数量 | +设备编码 | +额定载荷KN | +试验载荷KN | +持荷时间min | +试验日期 | +下次试验日期 | +检验结论 | +备注 | +
|---|---|---|---|---|---|---|---|---|---|---|---|
| {{ item.typeName }} | +{{ item.typeModelName }} | +{{ item.unit }} | +{{ item.num }} | +{{ item.maCode }} | +{{ item.ratedLoad }} | +{{ item.testLoad }} | +{{ item.holdingTime }} | +{{ item.testTime }} | +{{ item.nextTestTime }} | +{{ item.checkResult }} | +{{ item.remark }} | +
-
-
-
-
-
- 检验单位：
-
-
-
+
+
+
+
+ 检验单位：
+
+
+
+
- 导出
- 打 印
- 关 闭
-
+
+ 导出
+ 打 印
+ 关 闭
+
-
+
-
+
+
+
+
-
+
+
+
+
-
+
+
+
+
- 领料单
-
-
-
+
+
+
+
-
打 印
@@ -291,24 +376,40 @@
-
@@ -324,24 +425,24 @@ import {
applySend,
applySendAll,
getCheckInfo
-} from "@/api/lease/apply";
+} from '@/api/lease/apply'
-import vueEasyPrint from "vue-easy-print";
-import printJS from 'print-js';
-import html2canvas from 'html2canvas';
-import jsPDF from 'jspdf';
-import request from "@/utils/request";
+import vueEasyPrint from 'vue-easy-print'
+import printJS from 'print-js'
+import html2canvas from 'html2canvas'
+import jsPDF from 'jspdf'
+import request from '@/utils/request'
export default {
- name: "Home",
- dicts: ["lease_task_status", "ma_type_manage_type"],
+ name: 'Home',
+ dicts: ['lease_task_status', 'ma_type_manage_type'],
components: { vueEasyPrint },
data() {
return {
// 遮罩层
loading: true,
loadingTwo: true,
- updateTime: "",
+ updateTime: '',
// 选中数组
ids: [],
// 非单个禁用
@@ -367,7 +468,7 @@ export default {
chosenUserList: [],
userList: [],
// 弹出层标题
- title: "",
+ title: '',
// 日期范围
dateRange: [],
statusDataRange: [],
@@ -376,17 +477,15 @@ export default {
pageNum: 1,
pageSize: 10,
time: null, //申请时间
- keyWord: "",
- taskStatus: null, //申请时间
+ keyWord: '',
+ taskStatus: null //申请时间
},
form: {
- remark: "",
+ remark: ''
},
// 表单校验
rules: {
- remark: [
- { required: true, message: "通知内容不能为空", trigger: "blur" },
- ],
+ remark: [{ required: true, message: '通知内容不能为空', trigger: 'blur' }]
},
openPrint: false,
open: false,
@@ -394,7 +493,7 @@ export default {
printTableData: [],
checkDataInfo: {},
// 供应商
- supplierStr: "",
+ supplierStr: '',
//领料单
leaseApplyDetails: [],
@@ -403,10 +502,10 @@ export default {
sendTemp: [],
// 编码管理查看弹窗
showView: false,
- titleView: "",
+ titleView: '',
getListViewInfo: [],
- kgSignList: [], // 库管签名
- };
+ kgSignList: [] // 库管签名
+ }
},
created() {
const end = new Date()
@@ -414,7 +513,7 @@ export default {
start.setMonth(start.getMonth() - 2)
this.queryParams.time = [this.format(start), this.format(end)]
// this.getStatusList();
- this.getList();
+ this.getList()
// this.getTypeList()
},
methods: {
@@ -435,27 +534,25 @@ export default {
// 多选框选中数据
handleSelectionChange(selection) {
- this.sendTemp = [];
- this.ids = selection.map((item) => item.id);
- selection.forEach((item) => {
- this.sendTemp.push({ id: item.id, taskId: item.taskId });
- });
- this.single = selection.length != 1;
- this.multiple = !selection.length;
+ this.sendTemp = []
+ this.ids = selection.map(item => item.id)
+ selection.forEach(item => {
+ this.sendTemp.push({ id: item.id, taskId: item.taskId })
+ })
+ this.single = selection.length != 1
+ this.multiple = !selection.length
},
-
-
//是否可用勾选框
selectable(row) {
if (row.taskStatus == 1) {
- return true;
+ return true
} else {
- return false;
+ return false
}
},
getList() {
- this.loading = true;
+ this.loading = true
const params = {
keyWord: this.queryParams.keyWord,
taskStatus: this.queryParams.taskStatus,
@@ -463,551 +560,571 @@ export default {
endTime: this.queryParams.time && this.queryParams.time[1],
pageSize: this.queryParams.pageSize,
pageNum: this.queryParams.pageNum,
- statusList: this.queryParams.taskStatus ? [this.queryParams.taskStatus]:[1,2,3,4]
- };
- getListLeaseApply(params).then((response) => {
- this.typeList = response.data.rows;
- this.total = response.data.total;
- this.loading = false;
- });
+ statusList: this.queryParams.taskStatus ? [this.queryParams.taskStatus] : [1, 2, 3, 4]
+ }
+ getListLeaseApply(params).then(response => {
+ this.typeList = response.data.rows
+ this.total = response.data.total
+ this.loading = false
+ })
},
/** 搜索按钮操作 */
handleQuery() {
- this.queryParams.pageNum = 1;
- this.getList();
+ this.queryParams.pageNum = 1
+ this.getList()
},
/** 重置按钮操作 */
resetQuery() {
- this.resetForm("queryForm");
- this.queryParams.keyWord = "";
+ this.resetForm('queryForm')
+ this.queryParams.keyWord = ''
const end = new Date()
let start = new Date()
start.setMonth(start.getMonth() - 2)
this.queryParams.time = [this.format(start), this.format(end)]
- this.handleQuery();
+ this.handleQuery()
},
/** 新增按钮操作 */
handleAdd() {
- this.$emit("addTools");
+ this.$emit('addTools')
},
/** 查看按钮操作 */
handleView(row) {
- this.$emit("queryTools", row.taskId, row.id);
+ this.$emit('queryTools', row.taskId, row.id)
},
/** 修改按钮操作 */
handleUpdate(row) {
- this.$emit("editTools", row.taskId, row.id);
+ this.$emit('editTools', row.taskId, row.id)
},
//----消息通知
getNowTime() {
- var today = new Date();
- var year = today.getFullYear(); //获取年份
- var month = today.getMonth() + 1; //获取月份
- var day = today.getDate(); //获取日期
- return year + "-" + month + "-" + day;
+ var today = new Date()
+ var year = today.getFullYear() //获取年份
+ var month = today.getMonth() + 1 //获取月份
+ var day = today.getDate() //获取日期
+ return year + '-' + month + '-' + day
},
// 表单重置
reset() {
this.form = {
- taskId: "",
- remark: "",
- };
- this.resetForm("form");
+ taskId: '',
+ remark: ''
+ }
+ this.resetForm('form')
},
//获取验收单数据
getPrintTable(taskId) {
- getAcceptanceForm({ taskId: taskId }).then((response) => {
- this.printData = response.data;
- this.printTableData = response.data.checkDetailsList;
+ getAcceptanceForm({ taskId: taskId }).then(response => {
+ this.printData = response.data
+ this.printTableData = response.data.checkDetailsList
- let supplierList = [];
- this.printTableData.forEach((e) => {
+ let supplierList = []
+ this.printTableData.forEach(e => {
if (e.supplier) {
- supplierList.push(e.supplier);
+ supplierList.push(e.supplier)
}
- });
- supplierList = [...new Set(supplierList)];
+ })
+ supplierList = [...new Set(supplierList)]
- this.supplierStr = supplierList.join(",");
- });
+ this.supplierStr = supplierList.join(',')
+ })
},
//查看验收单
async handlePrint(row) {
- const res = await getCheckInfo({id:row.id});
- this.idTemp = row.id;
- this.checkDataInfo = res.data.leaseApplyInfo;
+ const res = await getCheckInfo({ id: row.id })
+ this.idTemp = row.id
+ this.checkDataInfo = res.data.leaseApplyInfo
- this.printTableData = res.data.leaseOutVoList;
+ this.printTableData = res.data.leaseOutVoList
setTimeout(() => {
this.chapter('检验专用章', '安徽送变电工程有限公司机具(物流)分公司')
- }, 500);
- this.openPrint = true;
- this.title = "出库检验单";
+ }, 500)
+ this.openPrint = true
+ this.title = '出库检验单'
},
/** 导出按钮操作 */
- handleExportCheck() {
- const formatTime = (date) => {
- const year = date.getFullYear();
- const month = String(date.getMonth() + 1).padStart(2, '0');
- const day = String(date.getDate()).padStart(2, '0');
- const hours = String(date.getHours()).padStart(2, '0');
- const minutes = String(date.getMinutes()).padStart(2, '0');
- const seconds = String(date.getSeconds()).padStart(2, '0');
- return `${year}${month}${day}_${hours}${minutes}${seconds}`;
- };
+ handleExportCheck() {
+ const formatTime = date => {
+ const year = date.getFullYear()
+ const month = String(date.getMonth() + 1).padStart(2, '0')
+ const day = String(date.getDate()).padStart(2, '0')
+ const hours = String(date.getHours()).padStart(2, '0')
+ const minutes = String(date.getMinutes()).padStart(2, '0')
+ const seconds = String(date.getSeconds()).padStart(2, '0')
+ return `${year}${month}${day}_${hours}${minutes}${seconds}`
+ }
- const currentTime = formatTime(new Date());
- this.download(
- "/material/lease_apply_info/exportInfo",
- { id:this.idTemp },
- `出库检验单_${currentTime}.xlsx`
- );
+ const currentTime = formatTime(new Date())
+ this.download('/material/lease_apply_info/exportInfo', { id: this.idTemp }, `出库检验单_${currentTime}.xlsx`)
},
//打开领料单
async handleLld(row) {
- this.title = "领料单";
- this.open = true;
- var ids = row.id;
- const res = await getApplyInfo(ids);
- this.leaseApplyDetails = res.data.leaseApplyDetailsList;
- this.leaseApplyData = res.data.leaseApplyInfo;
+ this.title = '领料单'
+ this.open = true
+ var ids = row.id
+ const res = await getApplyInfo(ids)
+ this.leaseApplyDetails = res.data.leaseApplyDetailsList
+ this.leaseApplyData = res.data.leaseApplyInfo
this.kgSignList = res.data.kgSignList || []
console.log('🚀 ~ handleLld ~ this.kgSignList:', this.kgSignList)
},
//出库检验单打印
printCheck() {
- const element = document.getElementById('checkId');
+ const element = document.getElementById('checkId')
// 确保元素存在
if (!element) {
- this.$message.error('未找到要打印的元素');
- return;
+ this.$message.error('未找到要打印的元素')
+ return
}
- this.$modal.loading('正在生成单据，请稍候...');
+ this.$modal.loading('正在生成单据，请稍候...')
// 查找页面中所有图片并预加载
- const images = element.querySelectorAll('img');
- const imagePromises = [];
+ const images = element.querySelectorAll('img')
+ const imagePromises = []
// 为每个图片创建加载或错误处理的Promise
images.forEach(img => {
// 如果图片已经加载完成，不需要处理
- if (img.complete) return;
+ if (img.complete) return
- const promise = new Promise((resolve) => {
- const originalSrc = img.src;
+ const promise = new Promise(resolve => {
+ const originalSrc = img.src
// 图片加载成功
- img.onload = function() {
- resolve();
- };
+ img.onload = function () {
+ resolve()
+ }
// 图片加载失败，使用空白图片替代
- img.onerror = function() {
- console.log('图片加载失败，使用空白图片替代:', originalSrc);
- img.src = 'data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=='; // 透明1x1像素图片
- resolve();
- };
- });
+ img.onerror = function () {
+ console.log('图片加载失败，使用空白图片替代:', originalSrc)
+ img.src = 'data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==' // 透明1x1像素图片
+ resolve()
+ }
+ })
- imagePromises.push(promise);
- });
+ imagePromises.push(promise)
+ })
// 等待所有图片加载完成或失败后再生成PDF
- Promise.all(imagePromises).then(() => {
- // 使用html2canvas将DOM元素转换为canvas
- html2canvas(element, {
- scale: 2, // 提高清晰度
- useCORS: true, // 允许加载跨域图片
- allowTaint: true,
- ignoreElements: (element) => {
- // 忽略所有图片加载错误
- return element.nodeName === 'IMG' && !element.complete;
- },
- logging: false, // 关闭日志记录
- imageTimeout: 3000, // 图片加载超时时间
- backgroundColor: '#ffffff'
- }).then(canvas => {
- // 创建PDF文档
- const pdf = new jsPDF('p', 'mm', 'a4');
+ Promise.all(imagePromises)
+ .then(() => {
+ // 使用html2canvas将DOM元素转换为canvas
+ html2canvas(element, {
+ scale: 2, // 提高清晰度
+ useCORS: true, // 允许加载跨域图片
+ allowTaint: true,
+ ignoreElements: element => {
+ // 忽略所有图片加载错误
+ return element.nodeName === 'IMG' && !element.complete
+ },
+ logging: false, // 关闭日志记录
+ imageTimeout: 3000, // 图片加载超时时间
+ backgroundColor: '#ffffff'
+ })
+ .then(canvas => {
+ // 创建PDF文档
+ const pdf = new jsPDF('p', 'mm', 'a4')
- // 获取canvas的宽度和高度
- const imgWidth = 210; // A4纸的宽度(mm)
- const pageHeight = 297; // A4纸的高度(mm)
- const imgHeight = canvas.height * imgWidth / canvas.width;
+ // 获取canvas的宽度和高度
+ const imgWidth = 210 // A4纸的宽度(mm)
+ const pageHeight = 297 // A4纸的高度(mm)
+ const imgHeight = (canvas.height * imgWidth) / canvas.width
- // 将canvas转换为图片
- const imgData = canvas.toDataURL('image/jpeg', 1.0);
+ // 将canvas转换为图片
+ const imgData = canvas.toDataURL('image/jpeg', 1.0)
- // 添加图片到PDF
- pdf.addImage(imgData, 'JPEG', 0, 0, imgWidth, imgHeight);
+ // 添加图片到PDF
+ pdf.addImage(imgData, 'JPEG', 0, 0, imgWidth, imgHeight)
- // 生成PDF文件名
- const fileName = `出库检验单_${this.checkDataInfo.leaseProject || '未命名'}_${new Date().getTime()}.pdf`;
+ // 生成PDF文件名
+ const fileName = `出库检验单_${this.checkDataInfo.leaseProject || '未命名'}_${new Date().getTime()}.pdf`
- // 将PDF转换为Blob对象
- const pdfBlob = pdf.output('blob');
+ // 将PDF转换为Blob对象
+ const pdfBlob = pdf.output('blob')
- // 创建FormData对象用于上传
- const formData = new FormData();
- formData.append('file', pdfBlob, fileName);
- formData.append('id', this.idTemp);
+ // 创建FormData对象用于上传
+ const formData = new FormData()
+ formData.append('file', pdfBlob, fileName)
+ formData.append('id', this.idTemp)
- // 上传到服务器
- this.$modal.closeLoading();
+ // 上传到服务器
+ this.$modal.closeLoading()
- // 调用上传API - 使用request
- request.post('/material/lease_apply_info/uploadCheckPdf', formData, {
- headers: {
- 'Content-Type': 'multipart/form-data'
- }
- }).then(response => {
- if (response.code === 200) {
- this.$modal.msgSuccess('单据文件已保存到服务器');
+ // 调用上传API - 使用request
+ request
+ .post('/material/lease_apply_info/uploadCheckPdf', formData, {
+ headers: {
+ 'Content-Type': 'multipart/form-data'
+ }
+ })
+ .then(response => {
+ if (response.code === 200) {
+ this.$modal.msgSuccess('单据文件已保存到服务器')
- // 上传成功后执行打印
- printJS({
- printable: 'checkId',
- type: 'html',
- targetStyles: ['*'],
- maxWidth:'1400'
- });
- } else {
- this.$modal.msgError('保存单据文件失败');
+ // 上传成功后执行打印
+ printJS({
+ printable: 'checkId',
+ type: 'html',
+ targetStyles: ['*'],
+ maxWidth: '1400'
+ })
+ } else {
+ this.$modal.msgError('保存单据文件失败')
- // 即使保存失败也执行打印
- printJS({
- printable: 'checkId',
- type: 'html',
- targetStyles: ['*'],
- maxWidth:'1400'
- });
- }
- }).catch(() => {
- this.$modal.msgError('上传单据文件时发生错误');
+ // 即使保存失败也执行打印
+ printJS({
+ printable: 'checkId',
+ type: 'html',
+ targetStyles: ['*'],
+ maxWidth: '1400'
+ })
+ }
+ })
+ .catch(() => {
+ this.$modal.msgError('上传单据文件时发生错误')
- // 即使上传失败也执行打印
- printJS({
- printable: 'checkId',
- type: 'html',
- targetStyles: ['*'],
- maxWidth:'1400'
- });
- });
- }).catch(error => {
- this.$modal.closeLoading();
- this.$modal.msgError('生成单据时发生错误');
- console.error('生成PDF错误:', error);
- });
- }).catch(error => {
- this.$modal.closeLoading();
- this.$modal.msgError('处理图片时发生错误');
- console.error('处理图片错误:', error);
- });
+ // 即使上传失败也执行打印
+ printJS({
+ printable: 'checkId',
+ type: 'html',
+ targetStyles: ['*'],
+ maxWidth: '1400'
+ })
+ })
+ })
+ .catch(error => {
+ this.$modal.closeLoading()
+ this.$modal.msgError('生成单据时发生错误')
+ console.error('生成PDF错误:', error)
+ })
+ })
+ .catch(error => {
+ this.$modal.closeLoading()
+ this.$modal.msgError('处理图片时发生错误')
+ console.error('处理图片错误:', error)
+ })
},
// 关闭弹窗并刷新页面
closeDialogAndRefresh() {
- this.openPrint = false;
+ this.openPrint = false
},
codeInfo(row) {
- this.showView = true;
- this.titleView = "查看";
- this.getListViewInfo = row.maCodeVoList;
+ this.showView = true
+ this.titleView = '查看'
+ this.getListViewInfo = row.maCodeVoList
},
//打印明细
printView() {
- const element = document.getElementById('remarksPrintRefView');
+ const element = document.getElementById('remarksPrintRefView')
// 确保元素存在
if (!element) {
- this.$message.error('未找到要打印的元素');
- return;
+ this.$message.error('未找到要打印的元素')
+ return
}
- this.$modal.loading('正在生成单据，请稍候...');
+ this.$modal.loading('正在生成单据，请稍候...')
// 查找页面中所有图片并预加载
- const images = element.querySelectorAll('img');
- const imagePromises = [];
+ const images = element.querySelectorAll('img')
+ const imagePromises = []
// 为每个图片创建加载或错误处理的Promise
images.forEach(img => {
// 如果图片已经加载完成，不需要处理
- if (img.complete) return;
+ if (img.complete) return
- const promise = new Promise((resolve) => {
- const originalSrc = img.src;
+ const promise = new Promise(resolve => {
+ const originalSrc = img.src
// 图片加载成功
- img.onload = function() {
- resolve();
- };
+ img.onload = function () {
+ resolve()
+ }
// 图片加载失败，使用空白图片替代
- img.onerror = function() {
- console.log('图片加载失败，使用空白图片替代:', originalSrc);
- img.src = 'data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=='; // 透明1x1像素图片
- resolve();
- };
- });
+ img.onerror = function () {
+ console.log('图片加载失败，使用空白图片替代:', originalSrc)
+ img.src = 'data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==' // 透明1x1像素图片
+ resolve()
+ }
+ })
- imagePromises.push(promise);
- });
+ imagePromises.push(promise)
+ })
// 等待所有图片加载完成或失败后再生成PDF
- Promise.all(imagePromises).then(() => {
- // 使用html2canvas将DOM元素转换为canvas
- html2canvas(element, {
- scale: 2, // 提高清晰度
- useCORS: true, // 允许加载跨域图片
- allowTaint: true,
- ignoreElements: (element) => {
- // 忽略所有图片加载错误
- return element.nodeName === 'IMG' && !element.complete;
- },
- logging: false, // 关闭日志记录
- imageTimeout: 3000, // 图片加载超时时间
- backgroundColor: '#ffffff'
- }).then(canvas => {
- // 创建PDF文档
- const pdf = new jsPDF('p', 'mm', 'a4');
+ Promise.all(imagePromises)
+ .then(() => {
+ // 使用html2canvas将DOM元素转换为canvas
+ html2canvas(element, {
+ scale: 2, // 提高清晰度
+ useCORS: true, // 允许加载跨域图片
+ allowTaint: true,
+ ignoreElements: element => {
+ // 忽略所有图片加载错误
+ return element.nodeName === 'IMG' && !element.complete
+ },
+ logging: false, // 关闭日志记录
+ imageTimeout: 3000, // 图片加载超时时间
+ backgroundColor: '#ffffff'
+ })
+ .then(canvas => {
+ // 创建PDF文档
+ const pdf = new jsPDF('p', 'mm', 'a4')
- // 获取canvas的宽度和高度
- const imgWidth = 210; // A4纸的宽度(mm)
- const pageHeight = 297; // A4纸的高度(mm)
- const imgHeight = canvas.height * imgWidth / canvas.width;
+ // 获取canvas的宽度和高度
+ const imgWidth = 210 // A4纸的宽度(mm)
+ const pageHeight = 297 // A4纸的高度(mm)
+ const imgHeight = (canvas.height * imgWidth) / canvas.width
- // 将canvas转换为图片
- const imgData = canvas.toDataURL('image/jpeg', 1.0);
+ // 将canvas转换为图片
+ const imgData = canvas.toDataURL('image/jpeg', 1.0)
- // 添加图片到PDF
- pdf.addImage(imgData, 'JPEG', 0, 0, imgWidth, imgHeight);
+ // 添加图片到PDF
+ pdf.addImage(imgData, 'JPEG', 0, 0, imgWidth, imgHeight)
- // 生成PDF文件名
- const fileName = `领料单编号明细_${new Date().getTime()}.pdf`;
+ // 生成PDF文件名
+ const fileName = `领料单编号明细_${new Date().getTime()}.pdf`
- // 将PDF转换为Blob对象
- const pdfBlob = pdf.output('blob');
+ // 将PDF转换为Blob对象
+ const pdfBlob = pdf.output('blob')
- // 创建FormData对象用于上传
- const formData = new FormData();
- formData.append('file', pdfBlob, fileName);
- formData.append('id', this.leaseApplyData.leaseProjectId);
+ // 创建FormData对象用于上传
+ const formData = new FormData()
+ formData.append('file', pdfBlob, fileName)
+ formData.append('id', this.leaseApplyData.leaseProjectId)
- // 上传到服务器
- this.$modal.closeLoading();
+ // 上传到服务器
+ this.$modal.closeLoading()
- // 调用上传API - 使用request
- request.post('/material/lease_apply_info/uploadDetailPdf', formData, {
- headers: {
- 'Content-Type': 'multipart/form-data'
- }
- }).then(response => {
- if (response.code === 200) {
- this.$modal.msgSuccess('单据文件已保存到服务器');
+ // 调用上传API - 使用request
+ request
+ .post('/material/lease_apply_info/uploadDetailPdf', formData, {
+ headers: {
+ 'Content-Type': 'multipart/form-data'
+ }
+ })
+ .then(response => {
+ if (response.code === 200) {
+ this.$modal.msgSuccess('单据文件已保存到服务器')
- // 上传成功后执行打印
- this.$refs.remarksPrintRefView.print();
- } else {
- this.$modal.msgError('保存单据文件失败');
+ // 上传成功后执行打印
+ this.$refs.remarksPrintRefView.print()
+ } else {
+ this.$modal.msgError('保存单据文件失败')
- // 即使保存失败也执行打印
- this.$refs.remarksPrintRefView.print();
- }
- }).catch(() => {
- this.$modal.msgError('上传单据文件时发生错误');
+ // 即使保存失败也执行打印
+ this.$refs.remarksPrintRefView.print()
+ }
+ })
+ .catch(() => {
+ this.$modal.msgError('上传单据文件时发生错误')
- // 即使上传失败也执行打印
- this.$refs.remarksPrintRefView.print();
- });
- }).catch(error => {
- this.$modal.closeLoading();
- this.$modal.msgError('生成单据时发生错误');
- console.error('生成单据错误:', error);
- });
- }).catch(error => {
- this.$modal.closeLoading();
- this.$modal.msgError('处理图片时发生错误');
- console.error('处理图片错误:', error);
- });
+ // 即使上传失败也执行打印
+ this.$refs.remarksPrintRefView.print()
+ })
+ })
+ .catch(error => {
+ this.$modal.closeLoading()
+ this.$modal.msgError('生成单据时发生错误')
+ console.error('生成单据错误:', error)
+ })
+ })
+ .catch(error => {
+ this.$modal.closeLoading()
+ this.$modal.msgError('处理图片时发生错误')
+ console.error('处理图片错误:', error)
+ })
},
//打印
print() {
- console.log("正在执行领料单打印操作");
+ console.log('正在执行领料单打印操作')
- const element = document.getElementById('checkIdTwo');
+ const element = document.getElementById('checkIdTwo')
// 确保元素存在
if (!element) {
- this.$message.error('未找到要打印的元素');
- return;
+ this.$message.error('未找到要打印的元素')
+ return
}
- this.$modal.loading('正在生成单据，请稍候...');
+ this.$modal.loading('正在生成单据，请稍候...')
// 查找页面中所有图片并预加载
- const images = element.querySelectorAll('img');
- const imagePromises = [];
+ const images = element.querySelectorAll('img')
+ const imagePromises = []
// 为每个图片创建加载或错误处理的Promise
images.forEach(img => {
// 如果图片已经加载完成，不需要处理
- if (img.complete) return;
+ if (img.complete) return
- const promise = new Promise((resolve) => {
- const originalSrc = img.src;
+ const promise = new Promise(resolve => {
+ const originalSrc = img.src
// 图片加载成功
- img.onload = function() {
- resolve();
- };
+ img.onload = function () {
+ resolve()
+ }
// 图片加载失败，使用空白图片替代
- img.onerror = function() {
- console.log('图片加载失败，使用空白图片替代:', originalSrc);
- img.src = 'data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=='; // 透明1x1像素图片
- resolve();
- };
- });
+ img.onerror = function () {
+ console.log('图片加载失败，使用空白图片替代:', originalSrc)
+ img.src = 'data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==' // 透明1x1像素图片
+ resolve()
+ }
+ })
- imagePromises.push(promise);
- });
+ imagePromises.push(promise)
+ })
// 等待所有图片加载完成或失败后再生成PDF
- Promise.all(imagePromises).then(() => {
- // 使用html2canvas将DOM元素转换为canvas
- html2canvas(element, {
- scale: 2, // 提高清晰度
- useCORS: true, // 允许加载跨域图片
- allowTaint: true,
- ignoreElements: (element) => {
- // 忽略所有图片加载错误
- return element.nodeName === 'IMG' && !element.complete;
- },
- logging: false, // 关闭日志记录
- imageTimeout: 3000, // 图片加载超时时间
- backgroundColor: '#ffffff'
- }).then(canvas => {
- // 创建PDF文档
- const pdf = new jsPDF('p', 'mm', 'a4');
+ Promise.all(imagePromises)
+ .then(() => {
+ // 使用html2canvas将DOM元素转换为canvas
+ html2canvas(element, {
+ scale: 2, // 提高清晰度
+ useCORS: true, // 允许加载跨域图片
+ allowTaint: true,
+ ignoreElements: element => {
+ // 忽略所有图片加载错误
+ return element.nodeName === 'IMG' && !element.complete
+ },
+ logging: false, // 关闭日志记录
+ imageTimeout: 3000, // 图片加载超时时间
+ backgroundColor: '#ffffff'
+ })
+ .then(canvas => {
+ // 创建PDF文档
+ const pdf = new jsPDF('p', 'mm', 'a4')
- // 获取canvas的宽度和高度
- const imgWidth = 210; // A4纸的宽度(mm)
- const pageHeight = 297; // A4纸的高度(mm)
- const imgHeight = canvas.height * imgWidth / canvas.width;
+ // 获取canvas的宽度和高度
+ const imgWidth = 210 // A4纸的宽度(mm)
+ const pageHeight = 297 // A4纸的高度(mm)
+ const imgHeight = (canvas.height * imgWidth) / canvas.width
- // 将canvas转换为图片
- const imgData = canvas.toDataURL('image/jpeg', 1.0);
+ // 将canvas转换为图片
+ const imgData = canvas.toDataURL('image/jpeg', 1.0)
- // 添加图片到PDF
- pdf.addImage(imgData, 'JPEG', 0, 0, imgWidth, imgHeight);
+ // 添加图片到PDF
+ pdf.addImage(imgData, 'JPEG', 0, 0, imgWidth, imgHeight)
- // 生成PDF文件名
- const fileName = `领料单_${this.leaseApplyData.code || '未命名'}_${new Date().getTime()}.pdf`;
+ // 生成PDF文件名
+ const fileName = `领料单_${this.leaseApplyData.code || '未命名'}_${new Date().getTime()}.pdf`
- // 将PDF转换为Blob对象
- const pdfBlob = pdf.output('blob');
+ // 将PDF转换为Blob对象
+ const pdfBlob = pdf.output('blob')
- // 创建FormData对象用于上传
- const formData = new FormData();
- formData.append('file', pdfBlob, fileName);
- formData.append('id', this.leaseApplyData.leaseProjectId);
+ // 创建FormData对象用于上传
+ const formData = new FormData()
+ formData.append('file', pdfBlob, fileName)
+ formData.append('id', this.leaseApplyData.leaseProjectId)
- // 上传到服务器
- this.$modal.closeLoading();
+ // 上传到服务器
+ this.$modal.closeLoading()
- // 调用上传API - 使用request
- request.post('/material/lease_apply_info/uploadPdf', formData, {
- headers: {
- 'Content-Type': 'multipart/form-data'
- }
- }).then(response => {
- if (response.code === 200) {
- this.$modal.msgSuccess('单据文件已保存到服务器');
+ // 调用上传API - 使用request
+ request
+ .post('/material/lease_apply_info/uploadPdf', formData, {
+ headers: {
+ 'Content-Type': 'multipart/form-data'
+ }
+ })
+ .then(response => {
+ if (response.code === 200) {
+ this.$modal.msgSuccess('单据文件已保存到服务器')
- // 上传成功后执行打印
- printJS({
- printable: 'checkIdTwo',
- type: 'html',
- targetStyles: ['*'],
- maxWidth:'1400'
- });
- } else {
- this.$modal.msgError('保存单据文件失败');
+ // 上传成功后执行打印
+ this.$refs.remarksPrintRef.print()
+ // printJS({
+ // printable: 'checkIdTwo',
+ // type: 'html',
+ // targetStyles: ['*'],
+ // maxWidth: '1400'
+ // })
+ } else {
+ this.$modal.msgError('保存单据文件失败')
- // 即使保存失败也执行打印
- printJS({
- printable: 'checkIdTwo',
- type: 'html',
- targetStyles: ['*'],
- maxWidth:'1400'
- });
- }
- }).catch(() => {
- this.$modal.msgError('上传单据文件时发生错误');
+ // 即使保存失败也执行打印
+ this.$refs.remarksPrintRef.print()
+ // printJS({
+ // printable: 'checkIdTwo',
+ // type: 'html',
+ // targetStyles: ['*'],
+ // maxWidth: '1400'
+ // })
+ }
+ })
+ .catch(() => {
+ this.$modal.msgError('上传单据文件时发生错误')
- // 即使上传失败也执行打印
- printJS({
- printable: 'checkIdTwo',
- type: 'html',
- targetStyles: ['*'],
- maxWidth:'1400'
- });
- });
- }).catch(error => {
- this.$modal.closeLoading();
- this.$modal.msgError('生成单据时发生错误');
- console.error('生成单据错误:', error);
- });
- }).catch(error => {
- this.$modal.closeLoading();
- this.$modal.msgError('处理图片时发生错误');
- console.error('处理图片错误:', error);
- });
+ // 即使上传失败也执行打印
+ this.$refs.remarksPrintRef.print()
+ // printJS({
+ // printable: 'checkIdTwo',
+ // type: 'html',
+ // targetStyles: ['*'],
+ // maxWidth: '1400'
+ // })
+ })
+ })
+ .catch(error => {
+ this.$modal.closeLoading()
+ this.$modal.msgError('生成单据时发生错误')
+ console.error('生成单据错误:', error)
+ })
+ })
+ .catch(error => {
+ this.$modal.closeLoading()
+ this.$modal.msgError('处理图片时发生错误')
+ console.error('处理图片错误:', error)
+ })
},
/** 删除按钮操作 */
handleDeletePurchase(row) {
// console.log(row)
- let ids = [];
- ids.push(row.id);
- console.log("ids", ids);
+ let ids = []
+ ids.push(row.id)
+ console.log('ids', ids)
this.$modal
- .confirm("是否确认删除所选择的数据项？")
+ .confirm('是否确认删除所选择的数据项？')
.then(function () {
- return applyRemove(ids);
+ return applyRemove(ids)
})
.then(() => {
- this.getList();
- this.$modal.msgSuccess("删除成功");
+ this.getList()
+ this.$modal.msgSuccess('删除成功')
})
- .catch(() => {});
+ .catch(() => {})
},
/** 导出按钮操作 */
handleExport() {
- const formatTime = (date) => {
- const year = date.getFullYear();
- const month = String(date.getMonth() + 1).padStart(2, '0');
- const day = String(date.getDate()).padStart(2, '0');
- const hours = String(date.getHours()).padStart(2, '0');
- const minutes = String(date.getMinutes()).padStart(2, '0');
- const seconds = String(date.getSeconds()).padStart(2, '0');
- return `${year}${month}${day}_${hours}${minutes}${seconds}`;
- };
+ const formatTime = date => {
+ const year = date.getFullYear()
+ const month = String(date.getMonth() + 1).padStart(2, '0')
+ const day = String(date.getDate()).padStart(2, '0')
+ const hours = String(date.getHours()).padStart(2, '0')
+ const minutes = String(date.getMinutes()).padStart(2, '0')
+ const seconds = String(date.getSeconds()).padStart(2, '0')
+ return `${year}${month}${day}_${hours}${minutes}${seconds}`
+ }
- const currentTime = formatTime(new Date());
+ const currentTime = formatTime(new Date())
const params = {
keyWord: this.queryParams.keyWord,
taskStatus: this.queryParams.taskStatus,
@@ -1015,121 +1132,117 @@ export default {
endTime: this.queryParams.time && this.queryParams.time[1],
pageSize: this.queryParams.pageSize,
pageNum: this.queryParams.pageNum,
- statusList: this.queryParams.taskStatus ? [this.queryParams.taskStatus]:[1,2,3,4]
- };
- this.download(
- "/material/lease_apply_info/export",
- { ...params },
- `领料申请_${currentTime}.xlsx`
- );
+ statusList: this.queryParams.taskStatus ? [this.queryParams.taskStatus] : [1, 2, 3, 4]
+ }
+ this.download('/material/lease_apply_info/export', { ...params }, `领料申请_${currentTime}.xlsx`)
},
//发布按钮
handleSend(row) {
- const param = { id: row.id, taskId: row.taskId };
+ const param = { id: row.id, taskId: row.taskId }
this.$modal
- .confirm("是否确认发布所选择的数据项？")
+ .confirm('是否确认发布所选择的数据项？')
.then(function () {
- return applySend(param);
+ return applySend(param)
})
.then(() => {
- this.getList();
- this.$modal.msgSuccess("发布成功");
+ this.getList()
+ this.$modal.msgSuccess('发布成功')
})
- .catch(() => {});
+ .catch(() => {})
},
handleSendAll() {
if (this.ids.length == 0) {
- this.$alert("请至少勾选一个领料申请", "提示", {
- type: "warning",
- confirmButtonText: "确定",
- });
- return;
+ this.$alert('请至少勾选一个领料申请', '提示', {
+ type: 'warning',
+ confirmButtonText: '确定'
+ })
+ return
} else {
- applySendAll(this.sendTemp).then((response) => {
+ applySendAll(this.sendTemp).then(response => {
if (response.code == 200) {
- this.$modal.msgSuccess("发布成功");
+ this.$modal.msgSuccess('发布成功')
}
- this.getList();
- });
+ this.getList()
+ })
}
},
chapter(text, companyName) {
- let canvas = document.getElementById("canvas");
- let context = canvas.getContext("2d");
- canvas.width = canvas.width;
- context.height = canvas.height;
- // // 清除画布内容
- // context.clearRect(0, 0, canvas.width, canvas.height);
- //let text = "XXX专用章";
- //let companyName = "XXX科技股份有限公司";
+ let canvas = document.getElementById('canvas')
+ let context = canvas.getContext('2d')
+ canvas.width = canvas.width
+ context.height = canvas.height
+ // // 清除画布内容
+ // context.clearRect(0, 0, canvas.width, canvas.height);
+ //let text = "XXX专用章";
+ //let companyName = "XXX科技股份有限公司";
- // 绘制印章边框
- let width = canvas.width / 2;
- let height = canvas.height / 2;
- context.lineWidth = 3;
- context.strokeStyle = "#f00";
- context.beginPath();
- context.arc(width, height, 80, 0, Math.PI * 2); //宽、高、半径
- context.stroke();
+ // 绘制印章边框
+ let width = canvas.width / 2
+ let height = canvas.height / 2
+ context.lineWidth = 3
+ context.strokeStyle = '#f00'
+ context.beginPath()
+ context.arc(width, height, 80, 0, Math.PI * 2) //宽、高、半径
+ context.stroke()
- //画五角星
- this.create5star(context, width, height, 20, "#f00", 0);
+ //画五角星
+ this.create5star(context, width, height, 20, '#f00', 0)
- // 绘制印章名称
- context.font = "100 13px 宋体";
- context.textBaseline = "middle"; //设置文本的垂直对齐方式
- context.textAlign = "center"; //设置文本的水平对对齐方式
- context.lineWidth = 0.7;
- context.strokeStyle = "#ff2323";
- context.strokeText(text, width, height + 50);
+ // 绘制印章名称
+ context.font = '100 13px 宋体'
+ context.textBaseline = 'middle' //设置文本的垂直对齐方式
+ context.textAlign = 'center' //设置文本的水平对对齐方式
+ context.lineWidth = 0.7
+ context.strokeStyle = '#ff2323'
+ context.strokeText(text, width, height + 50)
- // 绘制印章单位
- context.translate(width, height); // 平移到此位置,
- context.font = "100 13px 宋体";
- let count = companyName.length; // 字数
- let angle = (4 * Math.PI) / (3 * (count - 1)); // 字间角度
- let chars = companyName.split("");
- let c;
- for (let i = 0; i < count; i++) {
- c = chars[i]; // 需要绘制的字符
- if (i == 0) {
- context.rotate((5 * Math.PI) / 6);
- } else {
- context.rotate(angle);
+ // 绘制印章单位
+ context.translate(width, height) // 平移到此位置,
+ context.font = '100 13px 宋体'
+ let count = companyName.length // 字数
+ let angle = (4 * Math.PI) / (3 * (count - 1)) // 字间角度
+ let chars = companyName.split('')
+ let c
+ for (let i = 0; i < count; i++) {
+ c = chars[i] // 需要绘制的字符
+ if (i == 0) {
+ context.rotate((5 * Math.PI) / 6)
+ } else {
+ context.rotate(angle)
+ }
+
+ context.save()
+ context.translate(65, 0) // 平移到此位置,此时字和x轴垂直，公司名称和最外圈的距离
+ context.rotate(Math.PI / 2) // 旋转90度,让字平行于x轴
+ context.strokeStyle = '#ff2323' // 设置印章单位字体颜色为较浅的红色
+ context.strokeText(c, 0, 0) // 此点为字的中心点
+ context.restore()
}
-
- context.save();
- context.translate(65, 0); // 平移到此位置,此时字和x轴垂直，公司名称和最外圈的距离
- context.rotate(Math.PI / 2); // 旋转90度,让字平行于x轴
- context.strokeStyle = "#ff2323"; // 设置印章单位字体颜色为较浅的红色
- context.strokeText(c, 0, 0); // 此点为字的中心点
- context.restore();
- }
},
//绘制五角星
create5star(context, sx, sy, radius, color, rotato) {
- context.save();
- context.fillStyle = color;
- context.translate(sx, sy); //移动坐标原点
- context.rotate(Math.PI + rotato); //旋转
- context.beginPath(); //创建路径
+ context.save()
+ context.fillStyle = color
+ context.translate(sx, sy) //移动坐标原点
+ context.rotate(Math.PI + rotato) //旋转
+ context.beginPath() //创建路径
// let x = Math.sin(0);
// let y = Math.cos(0);
- let dig = (Math.PI / 5) * 4;
+ let dig = (Math.PI / 5) * 4
for (let i = 0; i < 5; i++) {
//画五角星的五条边
- let x = Math.sin(i * dig);
- let y = Math.cos(i * dig);
- context.lineTo(x * radius, y * radius);
+ let x = Math.sin(i * dig)
+ let y = Math.cos(i * dig)
+ context.lineTo(x * radius, y * radius)
}
- context.closePath();
- context.stroke();
- context.fill();
- context.restore();
+ context.closePath()
+ context.stroke()
+ context.fill()
+ context.restore()
}
},
@@ -1137,14 +1250,14 @@ export default {
$route: {
handler(to) {
if (to.query.keyWord) {
- this.queryParams.keyWord = to.query.keyWord;
+ this.queryParams.keyWord = to.query.keyWord
}
},
deep: true,
- immediate: true,
- },
- },
-};
+ immediate: true
+ }
+ }
+}
diff --git a/src/views/material/lease/materialConfirm/index.vue b/src/views/material/lease/materialConfirm/index.vue
index 9d57fb90..82fb8ca2 100644
--- a/src/views/material/lease/materialConfirm/index.vue
+++ b/src/views/material/lease/materialConfirm/index.vue
@@ -225,7 +225,7 @@
-
- 领料单位：
- {{ leaseApplyData.leaseUnit }}
+
- 领料单
+
+
-
+ 领料单位：
+ {{ leaseApplyData.leaseUnit }}
+
+
+ 工程名称：
+ {{ leaseApplyData.leaseProject }}
+
+
+ 发料单位：
+ {{ '机具物流分公司' }}
+
+
+ 时间：
+ {{ leaseApplyData.createTime.split(' ')[0] }}
+
+
+ 编号：
+ {{ leaseApplyData.code }}
+
- 工程名称：
- {{ leaseApplyData.leaseProject }}
-
-
- 发料单位：
- {{ "机具物流分公司" }}
-
-
- 时间：
- {{ leaseApplyData.createTime.split(" ")[0] }}
-
-
- 编号：
- {{ leaseApplyData.code }}
-
- | 序号 | +物资名称 | +规格型号 | +计量单位 | +领用数量 | +备注 | +出库方式 | +
|---|---|---|---|---|---|---|
| {{ index + 1 }} | +{{ item.maTypeName }} | +{{ item.typeName }} | +{{ item.unitName }} | +{{ item.preNum }} | +{{ item.remark }} | ++ + 编码出库 + + 数量出库 + | +
-
-
-
-
- 审核：
-
-
+
+
-
领料：
-
-
-
+
- ![]()
+
-
+
- 领料：
+
+
+ ![]()
+
-
- 库管：
-
- ![]()
+
-
+
+ 库管：
+
+ ![]()
+
+
+
制单：
-
制单：
-
- 领料单编号明细
+
+
+
+
+
+ 领料单编号明细
- | 序号 | +类型名称 | +规格型号 | +设备编码 | +
|---|---|---|---|
| {{ index + 1 }} | +{{ item.materialName }} | +{{ item.typeName }} | +{{ item.maCode }} | +
- 打 印
- 关 闭
+ 打 印
+ 关 闭
-
-
| 序号 | +物资名称 | +规格型号 | +计量单位 | +领用数量 | +备注 | +出库方式 | +
|---|---|---|---|---|---|---|
| {{ index + 1 }} | +{{ item.maTypeName }} | +{{ item.typeName }} | +{{ item.unitName }} | +{{ item.preNum }} | +{{ item.remark }} | ++ + 编码出库 + + 数量出库 + | +
@@ -324,12 +353,30 @@
+
+
+
+
领料单编号明细
- | 序号 | +类型名称 | +规格型号 | +设备编码 | +
|---|---|---|---|
| {{ index + 1 }} | +{{ item.materialName }} | +{{ item.typeName }} | +{{ item.maCode }} | +
@@ -661,4 +708,12 @@ export default {
width: 70px !important;
margin-bottom: 10px;
}
+.print-table {
+ table,
+ th,
+ td {
+ border: 1.5px solid black;
+ border-collapse: collapse;
+ }
+}
diff --git a/src/views/material/lease/outBound/index.vue b/src/views/material/lease/outBound/index.vue
index ab59bcf8..b090a432 100644
--- a/src/views/material/lease/outBound/index.vue
+++ b/src/views/material/lease/outBound/index.vue
@@ -157,7 +157,7 @@
style="margin-bottom: 10px"
type="primary"
@click="handleOut(scope.row)"
- v-if="scope.row.taskStatus != 4 && scope.row.leaseSignUrl"
+ v-if="scope.row.taskStatus != 4"
>
出库
@@ -316,9 +316,9 @@
-
+
-
+
-
+
+
-
+
施工机具设备出库检验记录表
@@ -334,7 +334,7 @@
{{ checkDataInfo.leaseUnit }}
| 机具名称 | +规格型号 | +单位 | +数量 | +设备编码 | +额定载荷KN | +试验载荷KN | +持荷时间min | +试验日期 | +下次试验日期 | +检验结论 | +备注 | +
|---|---|---|---|---|---|---|---|---|---|---|---|
| {{ item.typeName }} | +{{ item.typeModelName }} | +{{ item.unit }} | +{{ item.num }} | +{{ item.maCode }} | +{{ item.ratedLoad }} | +{{ item.testLoad }} | +{{ item.holdingTime }} | +{{ item.testTime }} | +{{ item.nextTestTime }} | +{{ item.checkResult }} | +{{ item.remark }} | +
@@ -416,7 +450,7 @@
{{ leaseApplyData.code }}
| 序号 | +物资名称 | +规格型号 | +计量单位 | +领用数量 | +备注 | +出库方式 | +
|---|---|---|---|---|---|---|
| {{ index + 1 }} | +{{ item.maTypeName }} | +{{ item.typeName }} | +{{ item.unitName }} | +{{ item.preNum }} | +{{ item.remark }} | ++ + 编码出库 + + 数量出库 + | +
审核：
@@ -528,7 +591,7 @@
>
领料单编号明细
| 序号 | +类型名称 | +规格型号 | +设备编码 | +
|---|---|---|---|
| {{ index + 1 }} | +{{ item.materialName }} | +{{ item.typeName }} | +{{ item.maCode }} | +
@@ -949,12 +1030,13 @@ export default {
//出库检验单打印
printCheck() {
- printJS({
- printable: 'checkId',
- type: 'html',
- targetStyles: ['*']
- // 其他配置选项
- })
+ this.$refs.remarksPrintRefCheck.print()
+ // printJS({
+ // printable: 'checkId',
+ // type: 'html',
+ // targetStyles: ['*']
+ // // 其他配置选项
+ // })
},
//领料单打印
@@ -1116,4 +1198,12 @@ export default {
.is-rotate {
transform: rotate(-90deg);
}
+.print-table {
+ table,
+ th,
+ td {
+ border: 1.5px solid black;
+ border-collapse: collapse;
+ }
+}
diff --git a/src/views/materialsStation/toolsBack/back/component/addReturn.vue b/src/views/materialsStation/toolsBack/back/component/addReturn.vue
index 99b42182..b20662c9 100644
--- a/src/views/materialsStation/toolsBack/back/component/addReturn.vue
+++ b/src/views/materialsStation/toolsBack/back/component/addReturn.vue
@@ -137,7 +137,7 @@
{{ index + 1 }}
{{ row.materialType }}
- {{ row.materialType }}
+ {{ row.materialName }}
{{ row.typeName }}
{{ row.unitName }}
{{ row.preNum }}
diff --git a/src/views/materialsStation/toolsLease/apply/component/homeApply.vue b/src/views/materialsStation/toolsLease/apply/component/homeApply.vue
index 0cacfc4e..7f30ff66 100644
--- a/src/views/materialsStation/toolsLease/apply/component/homeApply.vue
+++ b/src/views/materialsStation/toolsLease/apply/component/homeApply.vue
@@ -119,100 +119,6 @@
@pagination="getList"
/>
-
-
-
-
diff --git a/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue b/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue
index 71f12c63..28d21933 100644
--- a/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue
+++ b/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue
@@ -603,7 +603,7 @@ export default {
this.equipmentList.forEach(item => {
// item.preNum = item.preNum || 0
item.outNum = item.preNum || 0
- item.maCodeList = item.maCodeList || []
+ item.maCodeList = item.maCodeList || item.maCodeVoList || []
})
this.parentId = this.equipmentList[0].parentId
console.log('🚀 ~ awaitgetApplyInfo ~ this.parentId:', this.parentId)
diff --git a/src/views/materialsStation/toolsLease/outBound/component/homeApply.vue b/src/views/materialsStation/toolsLease/outBound/component/homeApply.vue
index 29187990..8d4226cf 100644
--- a/src/views/materialsStation/toolsLease/outBound/component/homeApply.vue
+++ b/src/views/materialsStation/toolsLease/outBound/component/homeApply.vue
@@ -111,65 +111,6 @@
@pagination="getList"
/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 施工机具设备出库检验记录表
-
-
-
-
-
-
- 领用工程：
- {{ checkDataInfo.leaseProject }}
-
-
- 使用单位：
- {{ checkDataInfo.leaseUnit }}
-
- | 机具名称 | -规格型号 | -单位 | -数量 | -设备编码 | -额定载荷KN | -试验载荷KN | -持荷时间min | -试验日期 | -下次试验日期 | -检验结论 | -备注 | -
|---|---|---|---|---|---|---|---|---|---|---|---|
| {{ row.typeName }} | -{{ row.typeModelName }} | -{{ row.unit }} | -{{ row.num }} | -{{ row.maCode }} | -{{ row.ratedLoad }} | -{{ row.testLoad }} | -{{ row.holdingTime }} | -{{ row.testTime }} | -{{ row.nextTestTime }} | -{{ row.checkResult }} | -{{ row.remark }} | -
-
-
-
-
- 检验单位：
-
-
-
-
-
- 导出
- 打 印
- 关 闭
-
-
@@ -260,7 +166,7 @@
类型名称
规格型号
计量单位
- 预领数量
+ 领料数量
备注
出库方式
-
-
-
-
-
-
-
-
-
-
- 施工机具设备出库检验记录表
-
-
-
-
- 领用工程：
- {{ checkDataInfo.leaseProject }}
-
-
- 使用单位：
- {{ checkDataInfo.leaseUnit }}
-
-
-
-
-
-
- 检验单位：
-
-
-
-
-
- 导出
- 打 印
- 关 闭
-
-
@@ -216,7 +157,7 @@
类型名称
规格型号
计量单位
- 预领数量
+ 领料数量
备注
出库方式
diff --git a/src/views/system/user/profile/index.vue b/src/views/system/user/profile/index.vue
index c230c32f..cdb832fe 100644
--- a/src/views/system/user/profile/index.vue
+++ b/src/views/system/user/profile/index.vue
@@ -77,8 +77,8 @@ export default {
};
},
created() {
- this.confirmPassword();
- //this.getUser();
+ // this.confirmPassword();
+ this.getUser()
},
methods: {
getUser() {