From 67da82f0b0c24df5f19bbfcfec63801d9ae902d8 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 16:22:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/quality/Packaging_ledger/index.vue | 154 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 128 insertions(+), 26 deletions(-)
diff --git a/src/views/quality/Packaging_ledger/index.vue b/src/views/quality/Packaging_ledger/index.vue
index 9a1c0ae..d37995d 100644
--- a/src/views/quality/Packaging_ledger/index.vue
+++ b/src/views/quality/Packaging_ledger/index.vue
@@ -9,10 +9,10 @@
:prelang="prelang"
:ajaxFun="ajaxFun"
:options="options"
- @currentChange="handleCurrentChange"
+ @handleSelectionChange="handleSelectionChange"
ref="processconfiguration"
>
- <template #toolbar></template>
+ <template #toolbar></template>
</ttable>
</el-col>
<el-col :span="13" style="padding-left: 10px">
@@ -41,6 +41,7 @@
</el-col>
<el-col :span="2">
<el-button
+ v-if="!isCheck"
style="float: right; padding: 3px 0"
type="text"
@click="relateOperationParam()"
@@ -70,23 +71,34 @@
<el-table-column
label="浜у搧"
prop="product"
+ show-overflow-tooltip
align="center"
/>
<el-table-column
label="浜у搧缂栧彿"
prop="productNo"
+ show-overflow-tooltip
+ align="center"
+ >
+ </el-table-column>
+ <el-table-column
+ label="鎵规鍙�"
+ prop="outBatchNo"
+ show-overflow-tooltip
align="center"
>
</el-table-column>
<el-table-column
label="瑙勬牸鍨嬪彿"
prop="specs"
+ show-overflow-tooltip
align="center"
>
</el-table-column>
<el-table-column
label="鍗曚綅"
prop="unit"
+ show-overflow-tooltip
align="center"
>
</el-table-column>
@@ -94,20 +106,16 @@
label="鏁伴噺"
prop="number"
align="center"
+ show-overflow-tooltip
width="80"
- >
- <template slot-scope="scope">
- <el-input v-model="scope.row.number"></el-input>
- </template>
- </el-table-column>
- <el-table-column label="鍗曚綅" prop="unit" align="center" />
+ ></el-table-column>
<el-table-column
fixed="right"
label="鎿嶄綔"
align="center"
width="80">
<template slot-scope="scope">
- <el-button @click="deleteadd(scope.row)" size="small">鍒犻櫎</el-button>
+ <el-button type="text" @click="deleteadd(scope.row)" icon="el-icon-delete" size="small">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -118,8 +126,7 @@
<!-- 鏂板 -->
<packfrom
:currshowlist.sync="addOrUpdateVisible"
- @way = "wayRenovate"
- >
+ @refreshDataList="getData">
</packfrom>
<packfromadd
:currshowlist.sync="increase"
@@ -127,7 +134,33 @@
@handleSelectionChange = "preserve"
>
</packfromadd>
- </basic-container>
+ </basic-container>
+ <el-dialog title="鏍囩鍒楄〃" top="5vh" :visible.sync="diaPrintTab" width="500px">
+ <div style="width:100%;height: 400px;overflow-y: auto;">
+ <div id="qrCard" class="dia_body">
+ <el-card class="box-card" v-for="(item, i) in qrData" :key="i" style="margin-bottom: 10px;">
+ <el-row>
+ <el-col :span="10" :offset="3">搴忓彿锛�</el-col>
+ <el-col :span="10" style="font-weight: bold;">{{ i + 1 }}</el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="10" :offset="3">鍖呰缂栧彿锛�</el-col>
+ <el-col :span="10" style="font-weight: bold;">{{ item.packageNo }}</el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="10" :offset="3">鍖呰鍙拌处浜岀淮鐮侊細</el-col>
+ <el-col :span="10">
+ <vueQr :text="JSON.stringify(item)" :size="110" :margin="1"></vueQr>
+ </el-col>
+ </el-row>
+ </el-card>
+ </div>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="diaPrintTab = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="printFun">鎵� 鍗�</el-button>
+ </span>
+ </el-dialog>
</div>
</template>
@@ -136,9 +169,15 @@
import ttable from '@/views/common/ztt-table.vue'
import packfrom from './pack-from.vue'
import packfromadd from './pack-fromadd.vue'
+import vueQr from 'vue-qr'
+import PrintJS from 'print-js'
export default {
data(){
return {
+ qrData:[],
+ diaPrintTab: false,
+ multipleSelection: [],
+ isCheck: false,
dataway:{},
goid:'',
testStandardParams: [],
@@ -155,7 +194,7 @@
border: true, // 鏄惁鏈夌旱鍚戣竟妗�
lazy: false, // 鏄惁闇�瑕佹噿鍔犺浇
fit: true, // 鍒楃殑瀹藉害鏄惁鑷拺寮�
- multiSelect: false, //
+ multiSelect: true, //
isEdit:false,
seqNo: true,
isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳
@@ -236,11 +275,16 @@
type: 'primary',
fun: this.addOrUpdateHandle
},
+ {
+ text: '鏍囩鎵撳嵃',
+ type: 'primary',
+ fun: this.printLabel
+ },
],
operator: [
{
text: '妫�楠�',
- icon: 'el-icon-delete',
+ icon: 'el-icon-position',
type: 'text',
size: 'small',
fun: this.check
@@ -262,14 +306,66 @@
}
},
components: {
- ttable,
- packfrom,
- packfromadd
- },
- watch: {
-
- },
+ ttable,
+ packfrom,
+ packfromadd,
+ vueQr
+ },
+ watch: {
+ diaPrintTab(newVal){
+ if(!newVal){
+ this.qrData = []
+ }
+ }
+ },
methods: {
+ //鎵撳嵃鎸夐挳
+ printFun() {
+ this.diaPrintTab = false;
+ PrintJS({
+ printable: 'qrCard',//椤甸潰
+ type: "html",//鏂囨。绫诲瀷
+ maxWidth:450,
+ targetStyles:['*'],
+ style: `@page {
+ margin:0;
+ padding: 0;
+ size: 360px 170px;
+ }
+ html{
+ zoom:100%;
+ }
+ @media print{
+ width: 360px;
+ height: 170px;
+ margin:0;
+ padding: 0;
+ }`,
+ onPrintDialogClose: this.erexcel=false,
+ targetStyles: ["*"], // 浣跨敤dom鐨勬墍鏈夋牱寮忥紝寰堥噸瑕�
+ font_size: '',
+ });
+ },
+ handleSelectionChange(val){
+ this.multipleSelection = val
+ let lastRow = val[val.length - 1]
+ this.handleCurrentChange(lastRow)
+ },
+ printLabel(){
+ if(this.multipleSelection.length==0){
+ this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
+ return
+ }
+ this.diaPrintTab = true
+ this.multipleSelection.forEach(item=>{
+ let obj = {
+ packageNo: item.packageNo,
+ contractNo: item.contractNo,
+ packageBoxId:item.id
+ }
+ this.qrData.push(obj)
+ })
+ },
// 鑾峰彇鏁版嵁鍒楄〃
getData() {
this.$refs.processconfiguration.refreshData()
@@ -289,6 +385,9 @@
})
},
handleCurrentChange(row){
+ if(row.state=='宸叉姤妫�'){
+ this.isCheck = true
+ }
this.dataway = row
this.packageBoxId = {
packageBoxId:row.id
@@ -311,16 +410,21 @@
},
preserve(datalist){
this.testStandardParams = datalist
-
},
//鍙宠竟淇濆瓨
addpreserve(){
this.testStandardParams.forEach(el => {
el.packageBoxId =this.goid
});
+ console.log(this.testStandardParams);
+ // return
saveList(this.testStandardParams).then((res) =>{
- this.$message.success('淇濆瓨鎴愬姛')
- this.rightquery()
+ if(res.status===200){
+ this.$message.success('淇濆瓨鎴愬姛')
+ this.rightquery()
+ }
+ }).catch(error=>{
+ console.error(error);
})
},
//鍒犻櫎
@@ -344,7 +448,5 @@
})
},
},
- computed: {
- },
}
</script>
\ No newline at end of file
--
Gitblit v1.9.3