From a0b1fdec2bc5ddad11e981936b80d0fdf1e4bc69 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 03 七月 2024 09:25:06 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/view/b1-inspection-order.vue | 354 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 330 insertions(+), 24 deletions(-)
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index d872ee8..7e989b0 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -9,6 +9,7 @@
height: 80px;
display: flex;
align-items: center;
+ overflow: hidden;
}
.search_thing {
@@ -67,6 +68,87 @@
.el-form-item {
margin-bottom: 16px;
}
+ .box-card >>>.el-radio__inner {
+ border-radius: 2px !important;
+ }
+ .box-card >>>.el-radio__input.is-checked .el-radio__inner::after {
+ content: '';
+ width: 8px;
+ height: 3px;
+ border: 1px solid white;
+ border-top: transparent;
+ border-right: transparent;
+ text-align: center;
+ display: block;
+ position: absolute;
+ top: 3px;
+ left: 2px;
+ transform: rotate(-45deg);
+ border-radius: 0px;
+ background: none;
+ }
+ >>>.el-radio__label{
+ color: #000 !important;
+ }
+ .el-dialog__body >>>.el-radio__label{
+ font-size: 8px;
+ }
+ .el-dialog__body >>>.el-radio__input.is-checked .el-radio__inner::after {
+ content: '';
+ width: 4px;
+ height: 3px;
+ border: 1px solid #000;
+ border-top: transparent;
+ border-right: transparent;
+ text-align: center;
+ display: block;
+ position: absolute;
+ top: 1px;
+ left: 2px;
+ transform: rotate(-45deg);
+ border-radius: 0px;
+ background: none;
+ }
+ >>>.el-radio__input.is-disabled.is-checked .el-radio__inner{
+ background: #3A7BFA;
+ }
+ .el-dialog__body >>>.el-radio__input.is-disabled.is-checked .el-radio__inner{
+ background: transparent;
+ }
+ .el-dialog__body >>>.el-radio__inner{
+ width: 8px !important;
+ height: 8px !important;
+ }
+ .el-dialog__body >>>.el-radio__label{
+ padding-left: 2px !important;
+ }
+ .el-dialog__body >>>.el-card__body{
+ padding: 0 !important;
+ }
+ .el-dialog__body >>>.el-radio__input.is-disabled .el-radio__inner{
+ border-color: #000 !important;
+ }
+ .el-dialog__body >>>.el-radio__input.is-disabled.is-checked .el-radio__inner{
+ border: none !important;
+ }
+ .scor{
+ width: 3px;
+ height: 3px;
+ border-radius: 1px;
+ border: 1px solid #000;
+ display: inline-block;
+ }
+ .ellipsis-multiline {
+ display: -webkit-box;
+ -webkit-line-clamp: 2;
+ -webkit-box-orient: vertical;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ word-wrap: break-word;
+ max-height: 3.0em; /* 楂樺害涓哄瓧浣撳ぇ灏忕殑涓ゅ�� */
+ line-height: 1.5em; /* 琛岄珮 */
+ height: 3.0em; /* 楂樺害涓鸿楂樼殑涓ゅ�� */
+ }
</style>
<template>
@@ -74,36 +156,37 @@
<div style="width: 100%;height: 100%;" v-if="active == 0">
<div>
<el-row class="title">
- <el-col :span="12" style="padding-left: 20px;">妫�楠屼笅鍗�</el-col>
+ <el-col :span="12" style="padding-left: 20px;text-align: left;">妫�楠屼笅鍗�</el-col>
<el-col :span="12" style="text-align: right;">
+ <el-button size="medium" type="primary" @click="print">鏍囩鎵撳嵃</el-button>
<el-button size="medium" type="primary" @click="playOrder(1)" v-if="addPower">涓嬪崟</el-button>
</el-col>
</el-row>
</div>
<div class="search" :style="`height: ${more?130:80}px;`">
- <el-row :gutter="10">
- <el-col :span="20" style="display: flex;align-items: center;flex-wrap: wrap;">
- <div class="search_thing">
+ <el-row :gutter="10" style="width: 100%;">
+ <el-col :span="20" style="display: flex;flex-wrap: wrap;">
+ <div class="search_thing" style="width: 20%;">
<div class="search_label">濮旀墭缂栧彿锛�</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
v-model="componentData.entity.entrustCode" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
- <div class="search_thing">
+ <div class="search_thing" style="width: 20%;">
<div class="search_label">鏍峰搧鍚嶇О锛�</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
v-model="componentData.entity.sampleType" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
- <div class="search_thing">
+ <div class="search_thing" style="width: 20%;">
<div class="search_label">鏍峰搧鍨嬪彿锛�</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
v-model="componentData.entity.sampleModel" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
- <div class="search_thing">
+ <div class="search_thing" style="width: 20%;">
<div class="search_label">鏍峰搧缂栧彿锛�</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
v-model="componentData.entity.sampleCode" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
- <div class="search_thing">
+ <div class="search_thing" style="width: 20%;">
<div class="search_label">涓嬪崟鏃堕棿锛�</div>
<div class="search_input">
<el-date-picker style="width:100%" v-model="componentData.entity.createTime"
@@ -116,24 +199,24 @@
</el-date-picker>
</div>
</div>
- <div class="search_thing" v-show="more">
+ <div class="search_thing" style="width: 20%;" v-if="more">
<div class="search_label">涓嬪崟浜猴細</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="componentData.entity.value1" @keyup.enter.native="refreshTable()"></el-input></div>
+ v-model="componentData.entity.name" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
- <div class="search_thing" v-show="more">
+ <div class="search_thing" style="width: 20%;" v-if="more">
<div class="search_label">宸ョ▼鍚嶇О锛�</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="componentData.entity.value2" @keyup.enter.native="refreshTable()"></el-input></div>
+ v-model="componentData.entity.engineering" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
- <div class="search_thing" v-show="more">
+ <div class="search_thing" style="width: 20%;" v-if="more">
<div class="search_label">鐢熶骇鍗曚綅锛�</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="componentData.entity.value3" @keyup.enter.native="refreshTable()"></el-input></div>
+ v-model="componentData.entity.production" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
</el-col>
<el-col :span="4">
- <div class="search_thing" style="padding-left: 10px;">
+ <div class="search_thing">
<el-button type="text" :icon="!more?'el-icon-arrow-down':'el-icon-arrow-up'" style="color: #3A7BFA;" @click="more=!more">{{!more?'鏇村':'鏀惰捣'}}</el-button>
<el-button size="small" @click="refresh()">閲� 缃�</el-button>
<el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
@@ -226,21 +309,131 @@
</el-dialog>
</div>
<div style="width: 100%;height: 100%;" v-if="active >0">
- <Add :active="active" :currentId="currentId" />
+ <Add :active="active" :currentId="currentId" v-if="active<4" />
</div>
+ <el-dialog title="鏍囩鎵撳嵃" :visible.sync="printDialogVisible" width="40%" top="5vh">
+ <div style="width:100%;height: 400px;overflow-y: auto;" v-loading="loadPint">
+ <div class="dia_body">
+ <el-checkbox
+ style="margin: 10px 5px;"
+ :indeterminate="isIndeterminate"
+ v-model="checkAll"
+ @change="handleCheckAllChange">鍏ㄩ��</el-checkbox>
+ <el-checkbox-group @change="changePrintCode()" v-model="checkIndexList">
+ <el-card class="box-card" v-for="(item, i) in qrData" :key="i" style="margin-bottom: 15px; font-size: 16px !important;">
+ <el-checkbox :label="i" :key="i" style="position: relative;top:-20px;left:5px"><br></el-checkbox>
+ <div>
+ <el-row style="font-size: 14px;padding-left: 20px;">
+ <el-col style="font-weight: bold;">{{ item.pName }}</el-col>
+ </el-row>
+ <div style="display: flex;">
+ <div>
+ <el-col :span="8" :offset="4">
+ <vueQr :text="JSON.stringify(item.sampleCode)" :size="140" :margin="2"></vueQr>
+ </el-col>
+ </div>
+ <div style="margin-left: 50px;width: 100%;">
+ <el-row>
+ <el-col style="font-weight: bold;font-size: 14px;"><span>鏍峰搧缂栧彿: </span>{{ item.sampleCode }}</el-col>
+ </el-row>
+ <el-row style="margin-top: 1px;font-size: 14px;">
+ <el-col style="font-weight: bold;"><span>濮旀墭鍗曞彿: </span>{{ item.code }}</el-col>
+ </el-row>
+ <el-row style="margin-top: 1px;font-size: 14px;">
+ <el-col style="font-weight: bold;"><span>瑙勬牸鍨嬪彿: </span>{{ item.model }}</el-col>
+ </el-row>
+ <el-row style="margin-top: 1px;font-size: 14px;">
+ <el-col style="font-weight: bold;"><span>鏍峰搧鍚嶇О: </span>{{ item.sampleName }}</el-col>
+ </el-row>
+ <el-row style="margin-top: 1px;font-size: 14px;" class="ellipsis-multiline">
+ <el-col style="font-weight: bold;"><span>妫�娴嬮」鐩�: </span>{{ item.item }}</el-col>
+ </el-row>
+ <el-row style="margin-top: 3px;font-size: 14px;">
+ <el-col style="font-weight: bold;display: flex;align-items: center;"><span>鏍峰搧鐘舵��: </span><el-radio-group :value="item.insState" style="margin-top: 7px;margin-left: 4px;" disabled>
+ <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><el-radio :label="1" style="font-weight: bold;margin-top: 7px;" v-model="item.isLeave" disabled>鐣欐牱</el-radio></el-col>
+ </el-row>
+ </div>
+ </div>
+ </div>
+ </el-card>
+ </el-checkbox-group>
+ </div>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-row>
+ <el-button @click="printDialogVisible=false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitPrint" :loading="printLoading">鎵� 鍗�</el-button>
+ </el-row>
+ </span>
+ </el-dialog>
+ <div class="el-dialog__body" style="width:320px;overflow-y: auto;position: absolute;top:9999px;margin-top: 0;position: fixed;top: 0;display: none;">
+ <div id="printMOrder">
+ <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="font-size: 8px !important;page-break-before:always;page-break-after: always;color: #000;">
+ <div style="display: flex;">
+ <div>
+ <el-col :span="8" :offset="4">
+ <vueQr :text="JSON.stringify(item.sampleCode)" :size="78" :margin="2"></vueQr>
+ </el-col>
+ </div>
+ <div style="margin-left: 57px;line-height: 9px;">
+ <el-row>
+ <el-col style="font-size: 8px;"><span>鏍峰搧缂栧彿: </span>{{ item.sampleCode }}</el-col>
+ </el-row>
+ <el-row style="font-size: 8px;">
+ <el-col><span>濮旀墭鍗曞彿: </span>{{ item.code }}</el-col>
+ </el-row>
+ <el-row style="font-size: 8px;">
+ <el-col><span>瑙勬牸鍨嬪彿: </span>{{ item.model }}</el-col>
+ </el-row>
+ <el-row style="font-size: 8px;">
+ <el-col ><span>鏍峰搧鍚嶇О: </span>{{ item.sampleName }}</el-col>
+ </el-row>
+ <el-row style="font-size: 8px;width: 140px;">
+ <el-col class="ellipsis-multiline"><span>妫�娴嬮」鐩�: </span>{{ item.item }}</el-col>
+ </el-row>
+ <el-row style="margin-top: 3px;font-size: 8px;">
+ <el-col style="display: flex;align-items: center;"><span>鏍峰搧鐘舵��:
+ </span>
+ <span style="white-space: nowrap;"><span v-if="item.insState==0">鈭�</span><span class="scor" v-if="item.insState!=0"></span>寰呮
+ <span v-if="item.insState==1">鈭�</span><span class="scor" v-if="item.insState!=1"></span>鍦ㄦ
+ <span v-if="item.insState==2">鈭�</span><span class="scor" v-if="item.insState!=2"></span>宸叉
+ <span v-if="item.isLeave==1">鈭�</span><span class="scor" v-if="item.isLeave!=1"></span>鐣欐牱</span>
+ <!-- <el-radio-group :value="item.insState" style="margin-top: 3px;margin-left: 1px;" disabled>
+ <el-radio :label="0" style="margin-right: 3px;font-size: 6px;">寰呮</el-radio>
+ <el-radio :label="1" style="margin-right: 3px;font-size: 6px;">鍦ㄦ</el-radio>
+ <el-radio :label="2" style="margin-right: 3px;font-size: 6px;">宸叉</el-radio>
+ </el-radio-group><el-radio :label="1" style="margin-top: 3px;font-size: 8px;" v-model="item.isLeave" disabled>鐣欐牱</el-radio> -->
+ </el-col>
+ </el-row>
+ </div>
+ </div>
+ </el-card>
+ </div>
+ </div>
</div>
</template>
<script>
import ValueTable from '../tool/value-table.vue'
import Add from '../do/b1-ins-order/add.vue'
+ import vueQr from 'vue-qr'
+ import PrintJS from 'print-js'
export default {
components: {
ValueTable,
- Add
+ Add,
+ vueQr
},
data() {
return {
+ loadPint:false,
+ checkAll: false,
+ isIndeterminate: true,
+ printLoading:false,
+ printDialogVisible:false,
//鏄惁瀹℃牳閫氳繃 true鏄� false涓嶆槸
isPass: false,
//鏄惁瀹℃牳鎾ら攢 true鏄� false涓嶆槸
@@ -268,17 +461,18 @@
sampleModel: null,
sampleCode: null,
state: 0,
- value1:null,
- value2:null,
- value3:null,
+ name:null,
+ engineering:null,
+ production:null,
orderBy: {
field: 'id',
order: 'asc'
}
},
isIndex: true,
- showSelect: false,
- select: false,
+ showSelect: true,
+ select: true,
+ selectMethod:'selectMethod',
do: [{
id: 'dataLook',
font: '鏁版嵁鏌ョ湅',
@@ -320,7 +514,7 @@
}
}],
linkEvent: {
- entrustCode: {
+ sampleName: {
method: 'selectAllByOne'
}
},
@@ -454,9 +648,27 @@
active: 0, //1锛氫笅鍗曪紝2锛氭煡鐪嬶紝3锛氬鏍革紝4锛氬厜绾ら厤缃�,榛樿涓�0
currentId: null,
more:false,
- insOrderRow:{}
+ insOrderRow:{},
+ checkIndexList:[],
+ checkDataList:[
+ // {
+ // sampleCode:'11111'
+ // }
+ ],
+ qrData:[],
+ multipleSelection:[]
}
},
+ watch:{
+ printDialogVisible(newVal){
+ if(!newVal){
+ this.qrData = []
+ this.checkIndexList = []
+ this.checkDataList = []
+ this.isIndeterminate = true;
+ }
+ }
+ },
mounted() {
this.entityCopy = this.HaveJson(this.componentData.entity)
this.getPower()
@@ -466,6 +678,86 @@
this.selectEnumByCategoryForOrderType()
},
methods: {
+ selectMethod(val){
+ this.multipleSelection = val
+ },
+ getLabelPrinting(selection){
+ this.loadPint = true;
+ this.$axios.post(this.$api.insOrder.labelPrinting,{
+ ids:selection.map(m=>m.id).join(',')
+ }).then(res => {
+ let arr = res.data;
+ arr.forEach(a=>{
+ this.loadPint = false;
+ let arr1 = []
+ a.insProduct.forEach(b=>{
+ arr1.push(b.inspectionItem)
+ })
+ a.item = [...new Set(arr1)].join(',')
+ })
+ this.qrData = arr
+ console.log(this.qrData)
+ })
+ },
+ //閫夋嫨瑕佹墦鍗扮殑浜岀淮鐮�
+ changePrintCode(){
+ let indexList = this.checkIndexList
+ let arr = []
+ indexList.forEach(i=>{
+ arr.push(this.qrData[i])
+ })
+ this.checkDataList = arr
+ },
+ //鍏ㄩ��
+ handleCheckAllChange(val) {
+ if(val){
+ for(var i=0;i<this.qrData.length;i++){
+ this.checkIndexList.push(i)
+ }
+ this.checkDataList = this.qrData
+ }else{
+ this.checkIndexList = []
+ this.checkDataList = []
+ }
+ this.isIndeterminate = false;
+ },
+ submitPrint(){
+ if(this.checkDataList.length < 1){
+ this.$message.warning("璇烽�夋嫨瑕佹墦鍗扮殑浜岀淮鐮�")
+ return
+ }
+ this.printDialogVisible = false;
+ PrintJS({
+ printable: 'printMOrder',//椤甸潰
+ type: "html",//鏂囨。绫诲瀷
+ maxWidth:450,
+ targetStyles:['*'],
+ style: `@page {
+ margin:0;
+ size: 360px 175px portrait;
+ }
+ html{
+ zoom:100%;
+ }
+ @media print{
+ width: 360px;
+ height: 175px;
+ margin:0;
+ }`,
+ onPrintDialogClose: this.erexcel=false,
+ targetStyles: ["*"], // 浣跨敤dom鐨勬墍鏈夋牱寮忥紝寰堥噸瑕�
+ font_size: '',
+ });
+ },
+ print(){
+ if(this.multipleSelection.length==0){
+ this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
+ return
+ }
+ let selection = this.multipleSelection
+ this.getLabelPrinting(selection)
+ this.printDialogVisible = true
+ },
getAuthorizedPerson() {
this.$axios.get(this.$api.user.getUserMenu).then(res => {
let data = []
@@ -491,6 +783,8 @@
let up = false
let del = false
let add = false
+ let revoke = false
+ let check = false
for (var i = 0; i < power.length; i++) {
if (power[i].menuMethod == 'upInsOrder') {
up = true
@@ -498,10 +792,22 @@
if (power[i].menuMethod == 'addInsOrder') {
add = true
}
+ if (power[i].menuMethod == 'updateStatus') {
+ revoke = true
+ }
+ if (power[i].menuMethod == 'upInsOrderOfState') {
+ check = true
+ }
}
if (!up) {
this.componentData.do.splice(4, 1)
}
+ if (!revoke) {
+ this.componentData.do.splice(3, 1)
+ }
+ if (!check) {
+ this.componentData.do.splice(2, 1)
+ }
this.addPower = add
},
handleClose() {
--
Gitblit v1.9.3