From e6e3ff9166c219af461bad39edf0019db7c65315 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 29 十月 2025 15:05:36 +0800
Subject: [PATCH] 外购成品报检相关问题调整
---
src/views/business/outsourcingFinishProduct/index.vue | 7
src/views/business/inspectionReview/index.vue | 3
src/views/business/outsourcingFinishProduct/components/printDialog.vue | 347 ++++++++++++++++++++++++++++++++++
src/views/business/inspectionTask/inspection.vue | 229 ++++++++++++++++------
src/views/business/inspectionTask/index.vue | 2
5 files changed, 513 insertions(+), 75 deletions(-)
diff --git a/src/views/business/inspectionReview/index.vue b/src/views/business/inspectionReview/index.vue
index 465024e..6e3eb15 100644
--- a/src/views/business/inspectionReview/index.vue
+++ b/src/views/business/inspectionReview/index.vue
@@ -105,7 +105,7 @@
width: "100px",
dataType: "tag",
formatData: (params) => {
- if (params == 0) {
+ if (params == 0 ) {
return "鎴愬搧涓嬪崟";
} else {
return "鍘熸潗鏂欎笅鍗�";
@@ -246,6 +246,7 @@
currentTime: null,
sonLaboratoryList: [],
typeSourceList: [
+ { label: '濮旀墭涓嬪崟', value: -1 },
{ label: '鎴愬搧涓嬪崟', value: 0 },
{ label: '鍘熸潗鏂欎笅鍗�', value: 1 },
],
diff --git a/src/views/business/inspectionTask/index.vue b/src/views/business/inspectionTask/index.vue
index 39e56b8..246b94b 100644
--- a/src/views/business/inspectionTask/index.vue
+++ b/src/views/business/inspectionTask/index.vue
@@ -3,7 +3,7 @@
<div style="height: 100%">
<div class="search">
<el-form :model="queryParams" ref="queryParams" size="small" :inline="true">
- <el-form-item label="鎵瑰彿" prop="updateBatchNo" v-if="tabIndex===1">
+ <el-form-item label="鎵瑰彿" prop="updateBatchNo" v-if="tabIndex!==0">
<el-input v-model="queryParams.updateBatchNo" clearable placeholder="璇疯緭鍏�" size="small"
@keyup.enter.native="refreshTable()">
</el-input>
diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue
index 40e6f22..7f8b10d 100644
--- a/src/views/business/inspectionTask/inspection.vue
+++ b/src/views/business/inspectionTask/inspection.vue
@@ -17,7 +17,7 @@
</el-form>
</el-col>
<el-col :span="insOrder.ifsOrderType!=='02wg'?16:24" style="text-align: right">
- <el-button v-if="insOrder.ifsOrderType" size="small" type="primary" @click="showMaterialPropsDialog">IFS鐗╂枡灞炴�ф洿鏂�</el-button>
+ <el-button v-if="insOrder.ifsOrderType && insOrder.ifsOrderType==='02wg'" size="small" type="primary" @click="showMaterialPropsDialog">IFS鐗╂枡灞炴�ф洿鏂�</el-button>
<el-button size="small" type="primary" @click="refreshView">鍒锋柊</el-button>
<el-button v-if="typeSource == 1" size="small" type="primary" @click="openPurchase">杩涜揣楠岃瘉</el-button>
<el-button v-if="state == 1 && typeSource == 1" size="small" type="primary"
@@ -33,60 +33,95 @@
</el-col>
</el-row>
<div class="search">
- <el-form :inline="true" :model="searchForm" class="form-inline" label-position="right" label-width="100px">
- <el-form-item label="濮旀墭缂栧彿:">
- <el-input v-model="insOrder.entrustCode" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>
- </el-form-item>
- <el-form-item label="鏍峰搧缂栧彿:">
- <el-tooltip :content="currentSample.sampleCode" :disabled="!currentSample.sampleCode">
- <el-input v-model="currentSample.sampleCode" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>
- </el-tooltip>
- </el-form-item>
- <el-form-item label="鏍峰搧鍚嶇О:">
- <el-input v-model="currentSample.sample" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>
- </el-form-item>
- <el-form-item label="鏍峰搧鏁伴噺:">
- <el-input v-model="sampleProduct.length" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>
- </el-form-item>
- <el-form-item label="鏍峰搧鍨嬪彿:">
- <el-input v-model="currentSample.model" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>
- </el-form-item>
- <el-form-item label="涓嬪彂鏃堕棿:">
- <el-input v-model="insOrder.sendTime" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>
- </el-form-item>
- <el-form-item label="绱ф�ョ▼搴�:">
- <el-input v-model="insOrder.typeName" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>
- </el-form-item>
- <el-form-item label="绾﹀畾鏃堕棿:">
- <el-input v-model="insOrder.appointed" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>
- </el-form-item>
- <el-form-item v-if="typeSource === 1" label="鎶芥鏁伴噺:">
- <el-input v-model="insOrder.testQuantity" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>
- </el-form-item>
- <el-form-item v-if="typeSource === 1" label="鍘傚瀵嗗害:">
- <el-input v-model="supplierDensity" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>
- </el-form-item>
- <el-form-item label="褰撳墠鏍峰搧浣嶆暟:" label-width="120px">
- <el-tag v-if="currentKey">{{ `NO.${currentKey}` }}</el-tag>
- </el-form-item>
- <el-form-item label="澶囨敞:">
- <!-- <span style="color:red">{{ insOrder.remark?insOrder.remark:'-' }}</span>-->
- <el-input v-model="insOrder.remark" :disabled="state != 1" clearable placeholder="璇疯緭鍏�" size="small"
- @blur="subOtherForm(insOrder.remark, 'remark')"></el-input>
- <!-- <el-tag v-if="currentKey">{{ insOrder.remark }}</el-tag> -->
- </el-form-item>
- <template v-if="insOrder.isSplitOrder && insOrder.isSplitOrder===1">
- <el-form-item label="澶栨姢棰滆壊:">
- <el-input v-model="insOrder.outerColor" clearable disabled placeholder="" size="small"></el-input>
- </el-form-item>
- <el-form-item label="缁濈紭棰滆壊:">
- <el-input v-model="insOrder.insulationColor" clearable disabled placeholder="" size="small"></el-input>
- </el-form-item>
- <el-form-item label="鐩樺彿:">
- <el-input v-model="insOrder.drumNo" clearable disabled placeholder="" size="small"></el-input>
- </el-form-item>
+<!-- <el-form :inline="true" :model="searchForm" class="form-inline" label-position="right" label-width="100px">-->
+<!-- <el-form-item label="濮旀墭缂栧彿:">-->
+<!-- <el-input v-model="insOrder.entrustCode" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="鏍峰搧缂栧彿:">-->
+<!-- <el-tooltip :content="currentSample.sampleCode" :disabled="!currentSample.sampleCode">-->
+<!-- <el-input v-model="currentSample.sampleCode" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>-->
+<!-- </el-tooltip>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="鏍峰搧鍚嶇О:">-->
+<!-- <el-input v-model="currentSample.sample" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="鏍峰搧鏁伴噺:">-->
+<!-- <el-input v-model="sampleProduct.length" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="鏍峰搧鍨嬪彿:">-->
+<!-- <el-input v-model="currentSample.model" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="涓嬪彂鏃堕棿:">-->
+<!-- <el-input v-model="insOrder.sendTime" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="绱ф�ョ▼搴�:">-->
+<!-- <el-input v-model="insOrder.typeName" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="绾﹀畾鏃堕棿:">-->
+<!-- <el-input v-model="insOrder.appointed" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item v-if="typeSource === 1" label="鎶芥鏁伴噺:">-->
+<!-- <el-input v-model="insOrder.testQuantity" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item v-if="typeSource === 1" label="鍘傚瀵嗗害:">-->
+<!-- <el-input v-model="supplierDensity" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="褰撳墠鏍峰搧浣嶆暟:" label-width="120px">-->
+<!-- <el-tag v-if="currentKey">{{ `NO.${currentKey}` }}</el-tag>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="澶囨敞:">-->
+<!-- <!– <span style="color:red">{{ insOrder.remark?insOrder.remark:'-' }}</span>–>-->
+<!-- <el-input v-model="insOrder.remark" :disabled="state != 1" clearable placeholder="璇疯緭鍏�" size="small"-->
+<!-- @blur="subOtherForm(insOrder.remark, 'remark')"></el-input>-->
+<!-- <!– <el-tag v-if="currentKey">{{ insOrder.remark }}</el-tag> –>-->
+<!-- </el-form-item>-->
+<!-- <template v-if="insOrder.isSplitOrder && insOrder.isSplitOrder===1">-->
+<!-- <el-form-item label="澶栨姢棰滆壊:">-->
+<!-- <el-input v-model="insOrder.outerColor" clearable disabled placeholder="" size="small"></el-input>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="缁濈紭棰滆壊:">-->
+<!-- <el-input v-model="insOrder.insulationColor" clearable disabled placeholder="" size="small"></el-input>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="鐩樺彿:">-->
+<!-- <el-input v-model="insOrder.drumNo" clearable disabled placeholder="" size="small"></el-input>-->
+<!-- </el-form-item>-->
+<!-- </template>-->
+<!-- </el-form>-->
+<!-- -->
+ <el-descriptions title="妫�楠屽崟姒傚喌" :column="4" border>
+ <template v-if="insOrder.ifsOrderType">
+ <el-descriptions-item label="闆朵欢鍙�">{{insOrder.partNo}}</el-descriptions-item>
+ <el-descriptions-item label="闆朵欢鍚嶇О">{{insOrder.partDetail}}</el-descriptions-item>
+ <el-descriptions-item label="鎵规鍙�">{{ insOrder.lotBatchNo }}</el-descriptions-item>
+ <el-descriptions-item label="鏍峰搧鍨嬪彿" >{{currentSample.model}}</el-descriptions-item>
+ <el-descriptions-item label="鎶芥鏁伴噺">{{insOrder.testQuantity}}</el-descriptions-item>
+ <el-descriptions-item label="鍘傚瀵嗗害">{{supplierDensity}}</el-descriptions-item>
+ <template v-if="insOrder.ifsOrderType && insOrder.ifsOrderType==='02wg'">
+ <el-descriptions-item label="杞藉叿缂栧彿">{{insOrder.drumNo}}</el-descriptions-item>
+ <el-descriptions-item label="璧峰绫虫爣(km)">{{insOrder.startMeterMark}}</el-descriptions-item>
+ <el-descriptions-item label="鎴绫虫爣(km)">{{insOrder.endMeterMark}}</el-descriptions-item>
+ <el-descriptions-item label="鍏ュ簱闀垮害(km)">{{calcInbondLength(insOrder.startMeterMark,insOrder.endMeterMark)}}</el-descriptions-item>
+ <el-descriptions-item label="缁濈紭棰滆壊">{{insOrder.insulationColor}}</el-descriptions-item>
+ <el-descriptions-item label="澶栨姢棰滆壊">{{insOrder.outerColor}}</el-descriptions-item>
+ <el-descriptions-item label="鍗板瓧淇℃伅">{{insOrder.letteringInfo}}</el-descriptions-item>
+ </template>
</template>
- </el-form>
+ <template v-else>
+ <el-descriptions-item label="濮旀墭缂栧彿">{{ insOrder.entrustCode }}</el-descriptions-item>
+ <el-descriptions-item label="鏍峰搧缂栧彿">{{ currentSample.sampleCode }}</el-descriptions-item>
+ <el-descriptions-item label="鏍峰搧鍚嶇О">{{ currentSample.sample }}</el-descriptions-item>
+ <el-descriptions-item label="鏍峰搧鏁伴噺">{{ sampleProduct.length }}</el-descriptions-item>
+ <el-descriptions-item label="鏍峰搧鍨嬪彿">{{ currentSample.model }}</el-descriptions-item>
+ <el-descriptions-item label="涓嬪彂鏃堕棿">{{ insOrder.sendTime }}</el-descriptions-item>
+ <el-descriptions-item label="绱ф�ョ▼搴�">{{ insOrder.typeName }}</el-descriptions-item>
+ <el-descriptions-item label="绾﹀畾鏃堕棿">{{ insOrder.appointed }}</el-descriptions-item>
+ </template>
+ <el-descriptions-item label="褰撳墠鏍峰搧浣嶆暟"><el-tag v-if="currentKey">{{ `NO.${currentKey}` }}</el-tag></el-descriptions-item>
+ <el-descriptions-item label="澶囨敞">
+ <el-input v-model="insOrder.remark" :disabled="state != 1" clearable placeholder="璇疯緭鍏�" size="small"
+ @blur="subOtherForm(insOrder.remark, 'remark')"></el-input>
+ </el-descriptions-item>
+ </el-descriptions>
</div>
<div class="center">
<div class="search" style="
@@ -545,22 +580,30 @@
width="20%">
<el-form style="width:100%" :model="ifsMaterialPropsForm">
<el-form-item label="杞藉叿缂栧彿(Attr1):">
- <el-input size="small" v-model="ifsMaterialPropsForm.drumNo"></el-input>
+ <el-input placeholder="杞藉叿缂栧彿" size="small" v-model="ifsMaterialPropsForm.drumNo"></el-input>
</el-form-item>
<el-form-item label="璧峰绫虫爣(Attr2):">
- <el-input size="small" v-model="ifsMaterialPropsForm.startMeterMark"></el-input>
+ <el-input @blur="validateQuality()" placeholder="璧峰绫虫爣" size="small" v-model="ifsMaterialPropsForm.startMeterMark">
+ <span slot="suffix">km</span>
+ </el-input>
</el-form-item>
<el-form-item label="鎴绫虫爣(Attr3):">
- <el-input size="small" v-model="ifsMaterialPropsForm.endMeterMark"></el-input>
+ <el-input @blur="validateQuality()" placeholder="鎴绫虫爣" size="small" v-model="ifsMaterialPropsForm.endMeterMark">
+ <span slot="suffix">km</span>
+ </el-input>
</el-form-item>
<!-- <el-form-item label="鍏ュ簱闀垮害">-->
<!-- <el-input v-model="ifsMaterialPropsForm.inboundLength"></el-input>-->
<!-- </el-form-item>-->
- <el-form-item label="缁濈紭棰滆壊(Attr4):">
- <el-input size="small" v-model="ifsMaterialPropsForm.insulationColor"></el-input>
+ <el-form-item label="澶栨姢棰滆壊(Attr4):">
+ <el-select size="small" v-model="ifsMaterialPropsForm.outerColor">
+ <el-option v-for="(item,index) in outerColorList" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
+ </el-select>
</el-form-item>
- <el-form-item label="澶栨姢棰滆壊(Attr5):">
- <el-input size="small" v-model="ifsMaterialPropsForm.outerColor"></el-input>
+ <el-form-item label="缁濈紭棰滆壊(Attr5):">
+ <el-select size="small" v-model="ifsMaterialPropsForm.insulationColor">
+ <el-option v-for="(item,index) in insulationColorList" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
+ </el-select>
</el-form-item>
<el-form-item label="鍗板瓧淇℃伅(Attr8):">
<el-select size="small" v-model="ifsMaterialPropsForm.letteringInfo" placeholder="璇烽�夋嫨">
@@ -583,8 +626,6 @@
import AddUnPass from "../unpass/components/addUnPass.vue";
import InspectionWord from "./components/InspectionWord.vue";
import PurchaseVerification from "../unpass/components/PurchaseVerification.vue";
-
-
import {
doInsOrder,
getCableTag,
@@ -611,6 +652,7 @@
import viewManHourDia from "@/views/business/inspectionTask/components/viewManHourDia.vue";
import {connect,disconnect,weightList} from "@/utils/connect";
import {getOneByIfsId,saveOrUpdateProps} from "@/api/business/ifsPartProps.js";
+import {getDicts} from "@/api/system/dict/data";
export default {
name: 'Inspection',
components: {
@@ -623,10 +665,12 @@
},
data() {
return {
+ outerColorList:[],
+ insulationColorList:[],
letteringInfoList: [],
ifsMaterialPropsForm:{
id:null,
- ifsOrderId: null,
+ ifsInventoryId: null,
drumNo: '', // 杞藉叿缂栧彿
startMeterMark: '', // 璧峰绫虫爣
endMeterMark: '', // 鎴绫虫爣
@@ -960,10 +1004,45 @@
}
},
methods: {
+ validateQuality(){
+ let inboundLength = Number(this.calcInbondLength(this.ifsMaterialPropsForm.startMeterMark,this.ifsMaterialPropsForm.endMeterMark));
+ let testQuantity = Number(this.insOrder.testQuantity);
+ if(inboundLength!=null && testQuantity!==inboundLength){
+ this.$message.warning(`鍏ュ簱闀垮害(${inboundLength}km)涓庢楠屾暟閲�(${testQuantity}km)涓嶇锛岃纭锛乣);
+ }
+ },
+ calcInbondLength(startMeterMark,endMeterMark){
+ let inboundLength = null;
+ if((startMeterMark!=null && startMeterMark!=='') && (endMeterMark!=null&&endMeterMark!=='')){
+ inboundLength = Math.abs(endMeterMark - startMeterMark)
+ }
+ return inboundLength;
+ },
+ getLetteringInfoDicts(){
+ getDicts("lettering_info_type").then(res=>{
+ if(res.code==200){
+ this.letteringInfoList = res.data
+ }
+ })
+ },
+ getInsulationColorDicts(){
+ getDicts("insulation_color_type").then(res=>{
+ if(res.code==200){
+ this.insulationColorList = res.data
+ }
+ })
+ },
+ getOuterColorDicts(){
+ getDicts("outer_color_type").then(res=>{
+ if(res.code==200){
+ this.outerColorList = res.data
+ }
+ })
+ },
closePartPropDialog(){
this.ifsMaterialPropsForm = {
id:null,
- ifsOrderId: null,
+ ifsInventoryId: null,
drumNo: '', // 杞藉叿缂栧彿
startMeterMark: '', // 璧峰绫虫爣
endMeterMark: '', // 鎴绫虫爣
@@ -982,6 +1061,7 @@
})
},
saveOrUpdatePartProp(){
+ this.ifsMaterialPropsForm.ifsInventoryId = this.insOrder.ifsInventoryId
saveOrUpdateProps({
...this.ifsMaterialPropsForm,
partNo: this.insOrder.partNo,
@@ -996,6 +1076,9 @@
//鎵撳紑IFS鐗╂枡灞炴�у脊妗�
showMaterialPropsDialog(){
this.getPartProps(this.insOrder.ifsInventoryId)
+ this.getOuterColorDicts()
+ this.getInsulationColorDicts()
+ this.getLetteringInfoDicts()
this.$nextTick(()=>{
this.ifsMaterialPropsVisible = true;
})
@@ -1088,8 +1171,10 @@
laboratory: this.sonLaboratory,
}).then(async (res) => {
this.insOrder = res.data.insOrder;
- //鏌ヨ闆朵欢灞炴��
- this.getPartProps(res.data.insOrder.ifsInventoryId)
+ if(res.data.insOrder.ifsOrderType){
+ //鏌ヨ闆朵欢灞炴��
+ this.getPartProps(res.data.insOrder.ifsInventoryId)
+ }
this.supplierDensity = res.data.supplierDensity;
this.getList()
this.urgentList.forEach((m) => {
@@ -1989,7 +2074,6 @@
} else if (c.v.ps != undefined && c.v.ps.value === "妫�楠岄」") {
if (count4 === 1) {
if (c.v.v) {
- console.log("杩涘叆1111111")
c.v.v = c.v.v.replace(/[\n\r\s]*/g, "");
}
str += c.v.v;
@@ -2075,6 +2159,10 @@
}
} else {
// 濡傛灉鐩哥瓑,閭ｄ箞璇存槑鎵惧埌浜�,骞朵笖鎶奿d瀛樿捣鏉�,鍚庣画妫�楠岄」涔熶細鍦ㄩ〉闈腑鏄剧ず鍑烘潵
+ let aa = inspectionItemClass +
+ inspectionItem +
+ inspectionItemSubclass;
+ console.log(aa,str,aa===str)
if (
this.currentSample.insProduct[i].templateId ===
a.templateId &&
@@ -2767,6 +2855,10 @@
this.$message.error("璇疯緭鍏ユ俯搴�");
return;
}
+ if (!this.insOrder.lotPartId && this.insOrder.ifsOrderType==='02wg') {
+ this.$message.error("璇峰～鍐橧FS搴撳瓨鐗╂枡鎵规灞炴��");
+ return;
+ }
this.submitLoading = true;
checkSubmitPlan({
orderId: this.orderId,
@@ -3107,6 +3199,7 @@
background-color: #fff;
border-radius: 3px;
margin-bottom: 10px;
+ padding: 10px;
}
.search .form-inline {
diff --git a/src/views/business/outsourcingFinishProduct/components/printDialog.vue b/src/views/business/outsourcingFinishProduct/components/printDialog.vue
new file mode 100644
index 0000000..77a921f
--- /dev/null
+++ b/src/views/business/outsourcingFinishProduct/components/printDialog.vue
@@ -0,0 +1,347 @@
+<template>
+ <div>
+ <el-dialog :visible.sync="isShow" title="鏍囩鎵撳嵃" top="5vh" width="600px" @close="$emit('closePrintDialog')">
+ <div style="width:100%;height: 400px;overflow-y: auto;text-align: left">
+ <div class="dia_body">
+ <el-checkbox
+ v-model="checkAll"
+ :indeterminate="isIndeterminate"
+ style="margin: 10px 5px;"
+ @change="handleCheckAllChange">鍏ㄩ��</el-checkbox>
+ <el-checkbox-group v-model="checkIndexList" @change="changePrintCode()">
+ <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 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>
+ </div>
+ <div class="item">
+ <span class="full-title">鐢熶骇鍗曚綅</span>:
+ <span class="info">{{ item.production }}</span>
+ </div>
+ <div class="item2">
+ <span class="full-title">瑙勬牸鍨嬪彿</span>:
+ <span class="info">{{ item.sampleModel }}</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>
+ <div style="font-weight: bold;display: flex;align-items: center;">
+ <span class="full-title">鏍峰搧鐘舵��</span>:
+ <el-radio-group v-model="item.insState" v-removeAriaHidden style="margin-top: 7px;margin-left: 4px;">
+ <el-radio :label="0" style="font-weight: bold;margin-right: 7px;">寰呮</el-radio>
+ <el-radio :label="1" style="font-weight: bold;margin-right: 7px;">鍦ㄦ</el-radio>
+ <el-radio :label="2" style="font-weight: bold;margin-right: 7px;">宸叉</el-radio>
+ </el-radio-group>
+ <span>
+ <el-radio v-model="item.isLeave"
+ :label="true"
+ size="small" style="margin-left: 14px;margin-top: 3px;" @click.native.prevent="changeIsLeave(item)">鐣欐牱</el-radio>
+ </span>
+ </div>
+ </div>
+ </div>
+ </el-card>
+ </el-checkbox-group>
+ </div>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-row>
+ <el-button @click="$emit('closePrintDialog')">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitPrint">鎵� 鍗�</el-button>
+ </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 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 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>
+ </div>
+ <div class="item">
+ <span class="full-title2">鐢熶骇鍗曚綅</span>:
+ <span class="info">{{ item.production }}</span>
+ </div>
+ <div class="item2">
+ <span class="full-title4">瑙勬牸鍨嬪彿:</span>
+ <span class="info4">{{ item.sampleModel }}</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>
+ <div>
+ <span class="full-title2">鏍峰搧鐘舵��</span>:
+ <span style="white-space: nowrap;margin-left: 2px">
+ 寰呮<span v-if="item.insState!==0" class="scor"></span><span v-if="item.insState===0" class="checked">鈭�</span>
+ 鍦ㄦ<span v-if="item.insState!==1" class="scor"></span><span v-if="item.insState===1" class="checked">鈭�</span>
+ 宸叉<span v-if="item.insState!==2" class="scor"></span><span v-if="item.insState===2" class="checked">鈭�</span>
+ 鐣欐牱<span v-if="!item.isLeave" class="scor"></span><span v-if="item.isLeave" class="checked">鈭�</span>
+ </span>
+ </div>
+ </div>
+ </div>
+ </el-card>
+ </div>
+ </div>
+ </div>
+</template>
+
+<script>
+import PrintJS from "print-js";
+import {labelOrderPrinting} from "@/api/business/productOrder";
+
+export default {
+ name: "printDialog",
+ // import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
+ components: {},
+ props: {
+ printDialog: {
+ type: Boolean,
+ default: () => false
+ },
+ },
+ data() {
+ // 杩欓噷瀛樻斁鏁版嵁
+ return {
+ isShow: this.printDialog,
+ loadPint: false,
+ isIndeterminate: false, // 澶氶�夋鏍峰紡
+ checkAll: false,
+ checkIndexList: [], // 閫夋嫨瑕佹墦鍗扮殑鏁版嵁
+ barcodeData: [],
+ printLoading: false,
+ checkDataList: []
+ }
+ },
+ // 鏂规硶闆嗗悎
+ methods: {
+ // 鑾峰彇瑕佹墦鍗扮殑鏁版嵁
+ getLabelPrinting(selection) {
+ try {
+ this.loadPint = true;
+ let ids = []
+ selection.map(m => {
+ ids.push(m.id)
+ })
+ labelOrderPrinting({
+ ids: ids
+ }).then(res => {
+ if (res.code === 200 && res.data.length > 0) {
+ res.data.forEach(item => {
+ item.sendTime = item.sendTime && item.sendTime.substring(0, 10)
+ item.sampleNumber = item.qtyArrived + item.buyUnitMeas
+ this.$set(item, 'barcode', item.entrustCode)
+ this.$set(item, 'isLeave', item.insState === '2')
+ })
+ this.barcodeData = res.data
+ }
+ })
+ } catch (e) {
+ console.log('鑾峰彇瑕佹墦鍗扮殑鏁版嵁---', e)
+ }
+
+ },
+ changeIsLeave(item) {
+ const index = this.barcodeData.findIndex(val => val.entrustCode === item.entrustCode)
+ if (index > -1) {
+ this.barcodeData[index].isLeave = !this.barcodeData[index].isLeave
+ }
+ },
+ // 鍏ㄩ�夊閫夋鍥炶皟
+ handleCheckAllChange(val) {
+ if (val) {
+ for (var i = 0; i < this.barcodeData.length; i++) {
+ this.checkIndexList.push(i)
+ }
+ this.checkDataList = this.barcodeData
+ } else {
+ this.checkIndexList = []
+ this.checkDataList = []
+ }
+ this.isIndeterminate = false;
+ },
+ changeType(type) {
+ type = type === '1' ? '0' : '1'
+ },
+ //閫夋嫨瑕佹墦鍗扮殑浜岀淮鐮�
+ changePrintCode() {
+ let indexList = this.checkIndexList
+ let arr = []
+ indexList.forEach(i => {
+ if (i !== undefined) {
+ arr.push(this.barcodeData[i])
+ }
+ })
+ console.log('arr---', arr)
+ this.checkDataList = arr
+ },
+ // 鎻愪氦鎵撳嵃
+ submitPrint() {
+ if (this.checkDataList.length < 1) {
+ this.$message.warning("璇烽�夋嫨瑕佹墦鍗扮殑鏉″舰鐮�")
+ return
+ }
+ this.printDialogVisible = false;
+ PrintJS({
+ targetStyles: ["*"], // 浣跨敤dom鐨勬墍鏈夋牱寮忥紝寰堥噸瑕�
+ printable: 'printOrder',//椤甸潰
+ type: "html",//鏂囨。绫诲瀷
+ maxWidth: 360,
+ header: '',
+ style:
+ `@page {
+ margin: 0.4cm;
+ margin-right: 0.4cm;
+ margin-top: 0.4cm;
+ margin-bottom: 0.4cm;
+ padding-bottom: 0px;
+ size: 400px 75px collapse;
+ }
+ html{
+ zoom:100%;
+
+ }
+ @media print{
+ width: 400px;
+ height: 75px;
+ margin:0;
+ }`,
+ onPrintDialogClose: this.erexcel = false,
+ font_size: '0.29cm',
+ });
+ },
+ },
+ watch: {
+ printDialog(newVal) {
+ if (!newVal) {
+ this.barcodeData = []
+ this.checkIndexList = []
+ this.checkDataList = []
+ this.isIndeterminate = true;
+ }
+ }
+ },
+}
+</script>
+
+<style scoped>
+.item {
+ margin-bottom: 4px;
+}
+
+.item2 {
+ margin-bottom: 8px;
+ vertical-align: top;
+}
+
+.full-title {
+ display: inline-block;
+ width: 80px;
+ text-align-last: justify;
+}
+
+.full-title2 {
+ display: inline-block;
+ width: 50px;
+ text-align-last: justify;
+}
+
+.full-title4 {
+ display: inline-block;
+ width: 53px;
+ text-align-last: justify;
+ vertical-align: top;
+}
+
+.info {
+ margin-left: 2px;
+}
+
+.info2 {
+ margin-left: 2px;
+ margin-right: 30px;
+ width: 80px;
+ display: inline-block;
+}
+
+.info3 {
+ margin-left: 2px;
+ margin-right: 8px;
+ width: 44px;
+ display: inline-block;
+}
+
+.info4 {
+ display: inline-block;
+ margin-left: 2px;
+ white-space: normal;
+ width: 260px;
+}
+
+.checkboxInfo {
+ display: inline-block;
+ margin-left: 10px;
+}
+
+.scor {
+ width: 0.06cm;
+ height: 0.06cm;
+ border-radius: 1px;
+ border: 1px solid #000;
+ display: inline-block;
+ margin-right: 14px;
+ margin-left: 4px;
+}
+
+.checked {
+ margin-right: 14px;
+ margin-left: 4px;
+}
+
+>>> .el-checkbox {
+ margin-right: 10px;
+}
+
+>>> .el-card {
+ border: none;
+}
+
+>>> .el-card__body {
+ padding: 4px 2px 6px 14px;
+}
+</style>
diff --git a/src/views/business/outsourcingFinishProduct/index.vue b/src/views/business/outsourcingFinishProduct/index.vue
index 399a386..ae67b91 100644
--- a/src/views/business/outsourcingFinishProduct/index.vue
+++ b/src/views/business/outsourcingFinishProduct/index.vue
@@ -183,19 +183,16 @@
import DownFileDialog from "@/views/business/materialOrderComponents/materialOrder/downFileDialog.vue";
import limsTable from "@/components/Table/lims-table.vue";
import {
- getWarehouseSubmit,
concessionRelease,
- getIfsByAll,
- getIfsByOver,
getIfsByQuarter,
- getIfsByStateOne,
rawAllExport,
rawOrderRelease,
repealEnterRawOrder,
repealQuarterRawOrder,
revokeInspectionReport,
updateEntrustCode
-} from "@/api/business/outsourcingFinishProductInspection";
+} from "@/api/business/rawMaterialOrder";
+import {getWarehouseSubmit,getIfsByStateOne,getIfsByOver,getIfsByAll} from "@/api/business/outsourcingFinishProductInspection";
import {mapGetters} from "vuex";
export default {
--
Gitblit v1.9.3