From 41cad2434411b2eac1b9814d47d06e34c291f285 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 29 三月 2024 16:29:40 +0800
Subject: [PATCH] 完成首页等问题修改
---
src/views/quality/Packaging_ledger/index.vue | 181 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 163 insertions(+), 18 deletions(-)
diff --git a/src/views/quality/Packaging_ledger/index.vue b/src/views/quality/Packaging_ledger/index.vue
index e5317bc..4f782fb 100644
--- a/src/views/quality/Packaging_ledger/index.vue
+++ b/src/views/quality/Packaging_ledger/index.vue
@@ -19,7 +19,7 @@
<el-card>
<div slot="header">
<el-row>
- <el-col :span="8">
+ <el-col :span="6">
<span>瑁呯鏄庣粏</span>
</el-col>
<el-col :span="8" :offset="4">
@@ -30,6 +30,15 @@
>
甯冨眬
</el-button> -->
+ </el-col>
+ <el-col :span="2">
+ <el-button
+ v-if="!isCheck && permissions.quality_packaging_ledger_info_add"
+ style="float: right; padding: 3px 6px;color:#fff;background-color: #9f7b95;"
+ type="text"
+ @click="handleCheck"
+ >鏍稿
+ </el-button>
</el-col>
<el-col :span="2">
<el-button
@@ -139,13 +148,13 @@
</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;">
- <div style="padding: 5px;">
+ <div class="dia_body" id="qrCard">
+ <el-card v-for="(item, i) in qrData" :key="i" >
+ <div>
<table border="2px" class="x1111116">
<tr class="x1111113">
<td class="x1111114" colspan=6>
- <div style="height: 75px;display: flex;margin-top: 2px;">
+ <div style="height: 60px;display: flex;margin-top: 4px;">
<div style="margin-top: 5px;">
<img width="150" height="48" src="../../../../public/img/image001.jpg" alt="IMG_256">
</div>
@@ -157,9 +166,9 @@
</tr>
<tr class="x1111117">
<td class="x1111114">
- <span style="font-family: 瀹嬩綋;text-align: center;">搴� 鍙�:</span>
+ <span style="font-family: 瀹嬩綋;text-align: center;">鍖� 瑁� 浜�:</span>
</td>
- <td class="x1111114" colspan=4 >{{ i + 1 }} </td>
+ <td class="x1111114" colspan=4 >{{ item.createUser }} </td>
<td class="x1111114" rowspan=3 >
<div style="padding: 1px;">
<vueQr :text=str+item.packageBoxId :size="110" :margin="1"></vueQr>
@@ -177,7 +186,6 @@
<span style="font-family: 瀹嬩綋;text-align: center;">鍚� 鍚� 鍙凤細</span>
</td>
<td class="x1111114" colspan=4>{{ item.contractNo }}</td>
-
</tr>
<tr class="x1111113">
<td class="x1111114" colspan=6>
@@ -214,11 +222,65 @@
<el-button type="primary" @click="printFun">鎵� 鍗�</el-button>
</span>
</el-dialog>
+ <input type="password" id="ScanCodeInfo" v-model="codeInfo" @keyup.enter="keyup" style="opacity: 0;height: 0px;margin: 0px;padding: 0px;position: absolute;top: 0;"></input>
+ <el-dialog title="鏍稿鍒楄〃" top="5vh" :visible.sync="checkShow" width="800px">
+ <el-table
+ :data="testStandardParams"
+ id="testStandardParamTable"
+ ref="testStandardParam"
+
+ highlight-current-row
+ height="700"
+ style="width: 100%"
+ class="l-mes-table"
+ border
+ stripe
+ >
+ <el-table-column
+ type ="index"
+ label="搴忓彿"
+ align="center"
+ width="50"
+ />
+ <el-table-column
+ label="浜у搧缂栧彿"
+ prop="productNo"
+ show-overflow-tooltip
+ align="center"
+ >
+ </el-table-column>
+ <el-table-column
+ label="浜у搧鍚嶇О"
+ prop="product"
+ show-overflow-tooltip
+ align="center"
+ />
+ <el-table-column
+ label="鎵规鍙�"
+ prop="outBatchNo"
+ show-overflow-tooltip
+ align="center"
+ >
+ </el-table-column>
+ <el-table-column
+ label="鏍稿"
+ prop="isCheck"
+ align="center"
+ show-overflow-tooltip
+ width="80"
+ >
+ <template slot-scope="scope">
+ <i class="el-icon-check" v-if="scope.row.isCheck"></i>
+ <i v-else></i>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-dialog>
</div>
</template>
<script>
-import { pagedata,dropById,list,saveList,deledata,sAuditstatus} from '@/api/quality/Packaging_ledger'
+import { pagedata,dropById,list,saveList,deledata,sAuditstatus,qualityPackageBoxDetail,qualityPackageBox} from '@/api/quality/Packaging_ledger'
import ttable from '@/views/common/ztt-table.vue'
import packfrom from './pack-from.vue'
import packfromadd from './pack-fromadd.vue'
@@ -231,6 +293,7 @@
str:"https://ztms-mes.chinaztt.cn/#/pack?id=",
qrData:[],
diaPrintTab: false,
+ checkShow:false,
multipleSelection: [],
isCheck: false,
dataway:{},
@@ -333,6 +396,8 @@
minWidth: 120
}
},
+ codeInfo:null,
+ startTime: null,
}
},
components: {
@@ -354,6 +419,11 @@
text: '鏍囩鎵撳嵃',
type: 'primary',
fun: this.printLabel
+ })
+ this.table.toolbar.push({
+ text: '涓嬭浇瑁呯娓呭崟',
+ type: 'primary',
+ fun: this.downOrder
})
}
let arr = []
@@ -392,6 +462,19 @@
if(!newVal){
this.qrData = []
}
+ },
+ checkShow(newVal){
+ if(newVal){
+ // this.$message.success('鎵爜锛氭墦寮�')
+ let input = document.getElementById('ScanCodeInfo');
+ input.focus();
+ this.startTime = setInterval(()=>{
+ input.focus()
+ },1000)
+ }else{
+ this.$message.warning('鎵爜锛氬叧闂�')
+ clearInterval(this.startTime)
+ }
}
},
methods: {
@@ -408,16 +491,16 @@
style: `@page {
margin:0;
padding: 0;
- size: 360px 170px;
+ size: 323px 210px landscape;
}
html{
zoom:100%;
}
@media print{
- width: 360px;
- height: 170px;
- margin:0;
- padding: 0;
+ width: 323px;
+ height: 210px;
+ margin:7cm 0mm 0mm 0mm;
+ padding: 0mm 10mm;
}`,
onPrintDialogClose: this.erexcel=false,
targetStyles: ["*"], // 浣跨敤dom鐨勬墍鏈夋牱寮忥紝寰堥噸瑕�
@@ -436,10 +519,11 @@
}
this.diaPrintTab = true
this.multipleSelection.forEach(item=>{
- let obj = {
+ const obj = {
packageNo: item.packageNo,
contractNo: item.contractNo,
- packageBoxId:item.id
+ packageBoxId:item.id,
+ createUser:item.createUser
}
this.qrData.push(obj)
})
@@ -509,6 +593,42 @@
console.error(error);
})
},
+ // 鏍稿
+ handleCheck(){
+ if(this.testStandardParams.length>0){
+ this.checkShow = true;
+ }else{
+ this.$message.warning('鏆傛棤鏍稿鏄庣粏')
+ }
+ },
+ keyup(e){
+ var code = ''
+ var str = {}
+ var that = this;
+ try{
+ code = JSON.parse(this.codeInfo)
+ if(code.moNo2==null||code.moNo2==undefined||code.moNo2==''){
+ this.$message.error('璇ヤ簩缁寸爜鏈夎')
+ }else{
+ str = {
+ moNo2: code.moNo2,
+ }
+ qualityPackageBoxDetail({
+ outBatchNo:str.moNo2,
+ packageBoxId:that.packageBoxId.packageBoxId
+ }).then(res=>{
+ if(res.data.data){
+ that.rightquery()
+ }else{
+ that.$message.error('璇ユ壒娆″彿涓嶅湪瑁呯娓呭崟鍐�')
+ }
+ })
+ }
+ }catch(e){
+ this.$message.error('璇ヤ簩缁寸爜鏈夎')
+ }
+ this.codeInfo = null
+ },
//鍒犻櫎
deleteadd(row){
deledata({id:row.id}).then((res)=>{
@@ -529,6 +649,31 @@
this.$message.success('妫�楠屾垚鍔�')
})
},
+ downOrder(){
+ if(this.multipleSelection.length==0){
+ this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
+ return
+ }else{
+ qualityPackageBox({id:this.multipleSelection[this.multipleSelection.length-1].id}).then(response=>{
+ console.log(response)
+ // 澶勭悊杩斿洖鐨勬枃浠舵祦
+ const blob = response.data
+ const link = document.createElement('a')
+ link.href = URL.createObjectURL(blob)
+ const disposition = response.headers['content-disposition']
+ let temp = disposition.substring(disposition.lastIndexOf('=') + 1)
+ link.download = decodeURI(temp)
+ document.body.appendChild(link)
+ link.click()
+ window.setTimeout(function () {
+ URL.revokeObjectURL(blob)
+ document.body.removeChild(link)
+ }, 0)
+ }).catch((error) => {
+ console.error(error)
+ })
+ }
+ }
},
}
</script>
@@ -550,8 +695,8 @@
}
.x1111116{
border: 1px solid black;
- height: 220px;
- width: 450px;
+ height: 200px;
+ width: 445px;
}
.x1111114{
border: 1px solid black;
--
Gitblit v1.9.3