diff --git a/package.json b/package.json index 6db0d753..8dbc90a0 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,8 @@ "vue-meta": "2.4.0", "vue-router": "3.4.9", "vuedraggable": "2.24.3", - "vuex": "3.6.0" + "vuex": "3.6.0", + "vue-easy-print": "0.0.8" }, "devDependencies": { "@vue/cli-plugin-babel": "4.4.6", diff --git a/src/views/material/lease/apply/component/homeApply.vue b/src/views/material/lease/apply/component/homeApply.vue index 03aed7a8..8a310da2 100644 --- a/src/views/material/lease/apply/component/homeApply.vue +++ b/src/views/material/lease/apply/component/homeApply.vue @@ -55,10 +55,12 @@ icon="el-icon-search" size="mini" @click="handleQuery" - >搜索搜索 + 重置重置 + @@ -71,7 +73,8 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - >领料申请领料申请 + @@ -81,7 +84,8 @@ icon="el-icon-plus" size="mini" @click="handleSendAll" - >发布发布 + @@ -91,7 +95,8 @@ icon="el-icon-download" size="mini" @click="handleExport" - >导出导出 + - - + + 查看查看 + 编辑编辑 + 发布发布 + + 领料单 + 领料单 - 出库检验单出库检验单 + 删除删除 + @@ -316,7 +327,7 @@ border > - + - + - + @@ -396,6 +407,119 @@ 关 闭 + + + + + + + 领料单 + + + 领料单位: + {{ leaseApplyData.leaseUnit }} + + + 工程名称: + {{ leaseApplyData.leaseProject }} + + + 时间: + {{ leaseApplyData.createTime }} + + + 编号: + {{ leaseApplyData.code }} + + + + + + + + + + + + + + + + + + + + + + + + + + + 审核: + + + 领料: + + + 仓库: + + + 操作人: + + + + + + + @@ -406,12 +530,15 @@ import { getAcceptanceForm, purchaseCheckInfoRemove, queryStatusDataApi, + getApplyInfo, applyRemove, } from "@/api/lease/apply"; +import vueEasyPrint from 'vue-easy-print' + export default { name: "Home", - dicts: ["lease_apply_status"], + dicts: ["lease_apply_status","ma_type_manage_type"], // components: { vueEasyPrint }, data() { return { @@ -463,14 +590,20 @@ export default { // 表单校验 rules: { remark: [ - { required: true, message: "通知内容不能为空", trigger: "blur" }, + {required: true, message: "通知内容不能为空", trigger: "blur"}, ], }, openPrint: false, + open: false, printData: {}, printTableData: [], // 供应商 supplierStr: "", + + //领料单 + leaseApplyDetails: [], + // 领料任务详情数据 + leaseApplyData: {}, }; }, created() { @@ -478,6 +611,7 @@ export default { this.getList(); // this.getTypeList() }, + components: { vueEasyPrint }, methods: { // getTypeList() { // getTypeList({ level: '3' }).then((response) => { @@ -556,7 +690,7 @@ export default { //获取验收单数据 getPrintTable(taskId) { - getAcceptanceForm({ taskId: taskId }).then((response) => { + getAcceptanceForm({taskId: taskId}).then((response) => { this.printData = response.data; this.printTableData = response.data.checkDetailsList; @@ -578,6 +712,18 @@ export default { this.openPrint = true; this.title = "机具设备到货验收单"; }, + + //打开领料单 + async handleLld(row) { + this.open = true + var ids = row.id + const res = await getApplyInfo(ids) + console.log(res) + this.leaseApplyDetails = res.data.leaseApplyDetailsList + this.leaseApplyData = res.data.leaseApplyInfo + console.log(this.leaseApplyData) + }, + //打印 print() { this.$refs.remarksPrintRef.print(); @@ -598,14 +744,15 @@ export default { this.getList(); this.$modal.msgSuccess("删除成功"); }) - .catch(() => {}); + .catch(() => { + }); }, /** 导出按钮操作 */ handleExport() { this.download( "/material/lease_apply_info/export", - { ...this.queryParams }, + {...this.queryParams}, `领料申请_${new Date().getTime()}.xlsx` ); }, diff --git a/src/views/material/repairTest/testExamine/index.vue b/src/views/material/repairTest/testExamine/index.vue new file mode 100644 index 00000000..435221cc --- /dev/null +++ b/src/views/material/repairTest/testExamine/index.vue @@ -0,0 +1,1304 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 查询 + 重置 + + + + + 批量审核 + + + 导出 + + + + + + + + + + + + + + + + + + + + + + 查看 + + 审核 + + + + + + + + + + + + + + + + + + + + + + 查询 + 重置 + + + + + + + + + + + + + + + + + 未审核 + 通过 + 驳回 + + + + + 维修记录 + + + + + + + + + + + + + + + + {{ + (repairRecordParams.pageNum - 1) * 10 + + scope.$index + + 1 + }} + + + + + + + + 内部 + 返厂 + 报废 + + + + + + + + 自然报废 + 人为报废 + + + + + + + + + + + {{ scope.row.partNum }} + + + + + + + + + + + + + 不收费 + 收费 + + + + + + + + + + + + {{ + (partRecordParams.pageNum - 1) * 10 + + scope.$index + + 1 + }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ openTextOne }} + {{ openTextTwo }} + + + + + + + + + + {{ openTextThree }} + + + + + + + + + + + + + + + + 你选择了{{ selectionList.length }}条数据,请进行审批 + + + + + + + +