| src/views/business/inspectionTask/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/business/materialOrderComponents/materialOrder/printDialog.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/business/productOrder/components/printDialog.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/standard/model/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/views/business/inspectionTask/index.vue
@@ -234,7 +234,6 @@ import UnPassRetestResult from "@/components/rawMaterialInspection/unPassRetestResult.vue" import { claimInsOrderPlan, upPlanUser2, upPlanUser, selectUserCondition, getBindingProductByProductId, @@ -244,6 +243,7 @@ selectInsOrderPlanList, selectSampleAndProductByOrderId, } from "@/api/business/inspectionTask.js"; import { treeDevice } from "@/api/cnas/resourceDemand/device.js"; import { mapGetters } from "vuex"; import {getRetestResult} from "@/api/business/rawMaterialOrder"; import {upReportUrl} from "@/api/business/insReport"; @@ -839,19 +839,29 @@ }, handleConnect(row) { this.orderId = row.id; this.connect = {}; this.connect = { connectPerson: "", sonLaboratory: "", }; this.sonLaboratoryList = []; this.connectVisible = true; upPlanUser2({ orderId: this.orderId }).then((res) => { if (res.code === 200 && res.data.length > 0) { this.sonLaboratoryList = []; res.data.forEach((m) => { this.sonLaboratoryList.push({ value: m, label: m, }); }); treeDevice().then((res) => { if (res.code === 200) { const laboratoryNames = [ ...new Set((res.data || []).map((item) => item && item.label).filter(Boolean)), ]; this.sonLaboratoryList = laboratoryNames.map((laboratoryName) => ({ value: laboratoryName, label: laboratoryName, })); if (this.sonLaboratoryList.length === 0) { this.$message.warning("暂无场所数据"); return; } this.connect.sonLaboratory = this.sonLaboratoryList[0].value; } }).catch(() => { this.$message.error("场所数据加载失败"); }); }, confirmConnect() { src/views/business/materialOrderComponents/materialOrder/printDialog.vue
@@ -12,7 +12,7 @@ <el-card class="box-card" v-for="(item, i) in barcodeData" :key="i" style="margin-bottom: 15px; font-size: 16px !important;"> <el-checkbox :label="i" :key="i" style="position: relative;top:0;left:10px"><br></el-checkbox> <div> <div class="titleH1" style="text-align: center; margin-bottom: 2px;font-size: 16px">检测中心样品标识卡</div> <div class="titleH1" style="text-align: center; margin-bottom: 2px;font-size: 16px">样品标识卡</div> <div style="text-align: center;"> <barcode :value="item.barcode" :height="34" :width="2" :displayValue="false"></barcode> </div> @@ -71,11 +71,11 @@ </el-row> </span> </el-dialog> <div class="el-dialog-body" style="overflow-y: auto;margin-top: 0;position: fixed;top: 20px;right: 10px;z-index: 99999;"> <div class="el-dialog-body" style="overflow-y: auto;margin-top: 0;position: fixed;top: -9999px;right: 10px;z-index: 99999;"> <div id="printOrder" class="printOrder" ref="printOrder"> <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="font-size: 0.29cm !important;font-weight: 700;page-break-after: always;color: #000;box-shadow: none;margin: 0 !important;padding: 0 !important;"> <div> <div class="titleH1" style="text-align: center;margin-bottom: 1px">检测中心样品标识卡</div> <div class="titleH1" style="text-align: center;margin-bottom: 1px">样品标识卡</div> <div style="text-align: center;"> <barcode :value="item.barcode" :height="22" :width="1.6" :displayValue="false"></barcode> </div> src/views/business/productOrder/components/printDialog.vue
@@ -12,36 +12,44 @@ <el-card v-for="(item, i) in barcodeData" :key="i" class="box-card" style="margin-bottom: 15px; font-size: 16px !important;"> <el-checkbox :key="i" :label="i" style="position: relative;top:0;left:10px"><br></el-checkbox> <div> <div class="titleH1" style="text-align: center; margin-bottom: 2px;font-size: 16px">检测中心样品标识卡</div> <div class="titleH1" style="text-align: center; margin-bottom: 2px;font-size: 16px">样品标识卡</div> <div style="text-align: center;"> <barcode :displayValue="false" :height="34" :value="item.barcode" :width="2"></barcode> </div> <div style="margin-left: 20px;text-align: left"> <div class="item"> <span class="full-title">样品名称</span>: <span class="info">{{ item.sampleView }}</span> <span class="full-title">委托编号</span>: <span class="value-wrap">{{ item.entrustCode }}</span> </div> <div class="item"> <span class="full-title">生产单位</span>: <span class="info">{{ item.production }}</span> <div class="item2 label-row"> <span class="label-col"> <span class="full-title">样品名称</span>: <span class="value-wrap">{{ item.sampleView }}</span> </span> <span class="label-col"> <span class="full-title">样品编号</span>: <span class="value-wrap">{{ item.sampleCode }}</span> </span> </div> <div class="item2"> <span class="full-title">规格型号</span>: <span class="info">{{ item.sampleModel }}</span> <div class="item label-row"> <span class="label-col"> <span class="full-title">送样单位</span>: <span class="value-wrap">{{ item.production }}</span> </span> <span class="label-col"> <span class="full-title">送样日期</span>: <span class="value-wrap">{{ item.sendTime }}</span> </span> </div> <div class="item"> <span class="full-title">送样日期</span>: <span class="info">{{ item.sendTime }}</span> </div> <div class="item"> <span class="full-title">委托人</span>: <span class="info2">{{ item.prepareUser }}</span> <span class="full-title">检测编号</span>: <span class="info">{{ item.entrustCode }}</span> </div> <div class="item"> <span class="full-title">样品数量</span>: <span class="info2">{{ item.testQuantity }}</span> <div class="item label-row"> <span class="label-col"> <span class="full-title">送样人</span>: <span class="value-wrap">{{ item.prepareUser }}</span> </span> <span class="label-col"> <span class="full-title">样品数量</span>: <span class="value-wrap">{{ item.testQuantity }}</span> </span> </div> <div style="font-weight: bold;display: flex;align-items: center;"> <span class="full-title">样品状态</span>: @@ -69,40 +77,48 @@ </el-row> </span> </el-dialog> <div class="el-dialog-body" style="overflow-y: auto;margin-top: 0;position: fixed;top: 20px;right: 10px;z-index: 99999;"> <div class="el-dialog-body" style="overflow-y: auto;margin-top: 0;position: fixed;top: -9999px;right: 10px;z-index: 99999;"> <div id="printOrder" ref="printOrder" class="printOrder"> <el-card v-for="(item, i) in checkDataList" :key="i" class="box-card" style="font-size: 0.29cm !important;font-weight: 700;page-break-after: always;color: #000;box-shadow: none;margin: 0 !important;padding: 0 !important;"> <div> <div class="titleH1" style="text-align: center;margin-bottom: 1px">检测中心样品标识卡</div> <div class="titleH1" style="text-align: center;margin-bottom: 1px">样品标识卡</div> <div style="text-align: center;"> <barcode :displayValue="false" :height="22" :value="item.barcode" :width="1.6"></barcode> </div> <div style="margin-left: 12px;text-align: left"> <div class="item"> <span class="full-title4">样品名称:</span> <span class="info4">{{ item.sampleView }}</span> <span class="full-title4">委托编号:</span> <span class="value-wrap">{{ item.entrustCode }}</span> </div> <div class="item"> <span class="full-title2">生产单位</span>: <span class="info">{{ item.production }}</span> <div class="item2 label-row"> <span class="label-col"> <span class="full-title4">样品名称:</span> <span class="value-wrap">{{ item.sampleView }}</span> </span> <span class="label-col"> <span class="full-title4">样品编号:</span> <span class="value-wrap">{{ item.sampleCode }}</span> </span> </div> <div class="item2"> <span class="full-title4">规格型号:</span> <span class="info4">{{ item.sampleModel }}</span> <div class="item label-row"> <span class="label-col"> <span class="full-title4">送样单位:</span> <span class="value-wrap">{{ item.production }}</span> </span> <span class="label-col"> <span class="full-title4">送样日期:</span> <span class="value-wrap">{{ item.sendTime }}</span> </span> </div> <div class="item"> <span class="full-title2">送样日期</span>: <span class="info">{{ item.sendTime }}</span> </div> <div class="item"> <span class="full-title2">委托人</span>: <span class="info3">{{ item.prepareUser }}</span> <span class="full-title2">检测编号</span>: <span class="info">{{ item.entrustCode }}</span> </div> <div class="item"> <span class="full-title2">样品数量</span>: <span class="info3">{{ item.testQuantity }}</span> <div class="item label-row"> <span class="label-col"> <span class="full-title4">送样人:</span> <span class="value-wrap">{{ item.prepareUser }}</span> </span> <span class="label-col"> <span class="full-title4">样品数量:</span> <span class="value-wrap">{{ item.testQuantity }}</span> </span> </div> <div> <span class="full-title2">样品状态</span>: @@ -288,29 +304,24 @@ vertical-align: top; } .info { margin-left: 2px; .label-row { display: flex; align-items: flex-start; } .info2 { margin-left: 2px; margin-right: 30px; width: 80px; display: inline-block; .label-col { flex: 1 1 0; min-width: 0; } .info3 { margin-left: 2px; margin-right: 8px; width: 44px; display: inline-block; .label-col + .label-col { margin-left: 6px; } .info4 { display: inline-block; .value-wrap { margin-left: 2px; white-space: normal; width: 260px; word-break: break-all; } .checkboxInfo { src/views/standard/model/index.vue
@@ -3,7 +3,7 @@ <div class="search"> <div class="search_box"> <div class="search_item"> <span class="search_label">模板名称</span> <span class="search_label">检验项目</span> <el-input v-model="queryParams.name" clearable placeholder="请输入" size="small" @keyup.enter.native="refreshTable()"></el-input> </div> @@ -27,10 +27,10 @@ <el-dialog :before-close="closeCopyTem" :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="isShowCopyTem" :title="title" width="35%" :modal-append-to-body="false"> <el-form ref="copyForm" :model="copyForm" :rules="copyFormRules" label-position="right" label-width="80px"> <el-form-item label="检验项目" prop="number"> <el-form-item label="检验依据" prop="number"> <el-input v-model="copyForm.number" clearable size="small"></el-input> </el-form-item> <el-form-item label="模版名称" prop="name"> <el-form-item label="检验项目" prop="name"> <el-input v-model="copyForm.name" clearable size="small"></el-input> </el-form-item> <el-form-item label="备注" prop="remark"> @@ -86,15 +86,15 @@ id: "", }, copyFormRules: { name: [{ required: true, message: "请输入模版名称", trigger: "blur" }], name: [{ required: true, message: "请输入检验项目", trigger: "blur" }], }, queryParams: { name: null, }, tableData: [], column: [ { label: "检验项目", prop: "number" }, { label: "模板名称", prop: "name" }, { label: "检验依据", prop: "number" }, { label: "检验项目", prop: "name" }, { label: "备注", prop: "remark" }, { label: "价格(元)", prop: "price" }, { label: "创建用户", prop: "createUserName" }, @@ -245,7 +245,7 @@ this.isShowCopyTem = false; this.submitCopyInfoLoading = false; this.$message.success("修改成功"); this.refreshTable("page"); this.getList(); }) .catch((err) => { console.log("copyTemplate----", err); @@ -258,7 +258,7 @@ this.isShowCopyTem = false; this.submitCopyInfoLoading = false; this.$message.success("复制成功"); this.refreshTable("page"); this.getList(); }) .catch((err) => { console.log("copyTemplate----", err); @@ -286,7 +286,10 @@ .then(() => { delStandardTemplate({ id: row.id }).then((res) => { this.$message.success("删除成功"); this.refreshTable("page"); if (this.tableData.length === 1 && this.page.current > 1) { this.page.current -= 1; } this.getList(); }); }) .catch(() => { });
