From 39607cc49e13f4d69d2d1ddf69f8e769eea714bc Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期五, 29 十二月 2023 16:50:57 +0800
Subject: [PATCH] modified: src/api/warehouse/pallettransports.js modified: src/views/warehouse/pallettransports/index.vue
---
src/views/quality/Packaging_ledger/index.vue | 190 +++++++++++++++++++++++++++--------------------
1 files changed, 110 insertions(+), 80 deletions(-)
diff --git a/src/views/quality/Packaging_ledger/index.vue b/src/views/quality/Packaging_ledger/index.vue
index b4837ac..718fb62 100644
--- a/src/views/quality/Packaging_ledger/index.vue
+++ b/src/views/quality/Packaging_ledger/index.vue
@@ -33,6 +33,7 @@
</el-col>
<el-col :span="2">
<el-button
+ v-if="permissions.quality_packaging_ledger_info_save"
style="float: right; padding: 3px 0"
type="text"
@click="addpreserve"
@@ -41,7 +42,7 @@
</el-col>
<el-col :span="2">
<el-button
- v-if="!isCheck"
+ v-if="!isCheck && permissions.quality_packaging_ledger_info_add"
style="float: right; padding: 3px 0"
type="text"
@click="relateOperationParam()"
@@ -71,23 +72,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>
@@ -95,19 +107,17 @@
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>
<el-table-column
+ v-if="permissions.quality_packaging_ledger_info_operate"
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>
@@ -128,23 +138,25 @@
</packfromadd>
</basic-container>
<el-dialog title="鏍囩鍒楄〃" top="5vh" :visible.sync="diaPrintTab" width="500px">
- <div id="qrCard" class="dia_body" style="height: 400px;overflow-y: auto;padding: 0 10px;">
- <el-card class="box-card" v-for="(item, i) in qrData" :key="i" style="margin-bottom: 15px;">
- <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="120" :margin="1"></vueQr>
- </el-col>
- </el-row>
- </el-card>
+ <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=str+item.packageBoxId :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>
@@ -161,9 +173,11 @@
import packfromadd from './pack-fromadd.vue'
import vueQr from 'vue-qr'
import PrintJS from 'print-js'
+import { mapGetters } from 'vuex'
export default {
data(){
return {
+ str:"http://192.168.2.213:8080/#/pack?id=",
qrData:[],
diaPrintTab: false,
multipleSelection: [],
@@ -259,33 +273,8 @@
searchInfoType: 'datetimerange',
},
],
- toolbar: [
- {
- text: '鏂板',
- type: 'primary',
- fun: this.addOrUpdateHandle
- },
- {
- text: '鏍囩鎵撳嵃',
- type: 'primary',
- fun: this.printLabel
- },
- ],
- operator: [
- {
- text: '妫�楠�',
- icon: 'el-icon-position',
- type: 'text',
- size: 'small',
- fun: this.check
- },{
- text: '鍒犻櫎',
- icon: 'el-icon-delete',
- type: 'text',
- size: 'small',
- fun: this.deleteHandle
- }
- ],
+ toolbar: [],
+ operator: null,
operatorConfig: {
fixed: 'right',
label: '鎿嶄綔',
@@ -301,6 +290,45 @@
packfromadd,
vueQr
},
+ created(){
+ if(this.permissions.quality_packaging_ledger_add){
+ this.table.toolbar.push({
+ text: '鏂板',
+ type: 'primary',
+ fun: this.addOrUpdateHandle
+ })
+ }
+ if(this.permissions.quality_packaging_ledger_labelprint){
+ this.table.toolbar.push({
+ text: '鏍囩鎵撳嵃',
+ type: 'primary',
+ fun: this.printLabel
+ })
+ }
+ let arr = []
+ if(this.permissions.quality_packaging_ledger_inspect){
+ arr.push({
+ text: '妫�楠�',
+ icon: 'el-icon-position',
+ type: 'text',
+ size: 'small',
+ fun: this.check
+ })
+ }
+ if(this.permissions.quality_packaging_ledger_del){
+ arr.push({
+ text: '鍒犻櫎',
+ icon: 'el-icon-delete',
+ type: 'text',
+ size: 'small',
+ fun: this.deleteHandle
+ })
+ }
+ this.table.operator = arr.length>0 ? arr : null
+ },
+ computed:{
+ ...mapGetters(['permissions'])
+ },
watch: {
diaPrintTab(newVal){
if(!newVal){
@@ -313,24 +341,32 @@
printFun() {
this.diaPrintTab = false;
PrintJS({
- printable: "qrCard",
- type: "html",
- // header: "鍘熸潗鏂欐娴嬫姤鍛�",
- targetStyles: ["*"],
- style: `@page {margin: 0mm 5mm;}
- html {zoom:100%;}
- @media print {
- html,body{
- width:60mm;
- height:40mm;
- }
- }`,
- ignoreElements: ["no-ignore"],
- orientation: 'portrait'
+ 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
+ console.log(this.multipleSelection[0].id,"鏁版嵁");
let lastRow = val[val.length - 1]
this.handleCurrentChange(lastRow)
},
@@ -340,24 +376,12 @@
return
}
this.diaPrintTab = true
- console.log(this.multipleSelection);
this.multipleSelection.forEach(item=>{
let obj = {
packageNo: item.packageNo,
contractNo: item.contractNo,
- boxInfo: []
+ packageBoxId:item.id
}
- list({packageBoxId:item.id}).then((res) =>{
- res.data.data.forEach(ele=>{
- obj.boxInfo.push({
- product: ele.product,
- productNo: ele.productNo,
- specs: ele.specs,
- unit: ele.unit,
- number: ele.number
- })
- })
- })
this.qrData.push(obj)
})
},
@@ -411,9 +435,15 @@
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);
})
},
//鍒犻櫎
--
Gitblit v1.9.3