From df85764203947543c0ced0a0cdf8b7299f6b40ff Mon Sep 17 00:00:00 2001 From: licp <lichunping@guanfang.com.cn> Date: 星期二, 28 五月 2024 13:28:22 +0800 Subject: [PATCH] 优化 --- src/views/quality/Packaging_ledger/index.vue | 158 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 152 insertions(+), 6 deletions(-) diff --git a/src/views/quality/Packaging_ledger/index.vue b/src/views/quality/Packaging_ledger/index.vue index d72861a..f1a80aa 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 @@ -138,7 +147,7 @@ </packfromadd> </basic-container> <el-dialog title="鏍囩鍒楄〃" top="5vh" :visible.sync="diaPrintTab" width="500px"> - <div style="width:100%;height: 400px;overflow-y: auto;"> + <div style="width:100%;height: 400px;overflow-y: auto;page-break-before:always;page-break-after: always;"> <div class="dia_body" id="qrCard"> <el-card v-for="(item, i) in qrData" :key="i" > <div> @@ -181,8 +190,8 @@ <tr class="x1111113"> <td class="x1111114" colspan=6> <div style="height: 75px;" > - <p><span lang="EN-US" class="x1111112">鍦板潃锛氭睙鑻忕渷鍗楅�氱粡娴庢妧鏈紑鍙戝尯甯稿叴璺�96鍙�</span></p> - <p><span lang="EN-US" class="x1111112">鐢佃瘽/浼犵湡锛�0513鈥�89191125</span></p> + <p style="margin-top: 0;margin-bottom: 0;"><span lang="EN-US" class="x1111112">鍦板潃锛氭睙鑻忕渷鍗楅�氱粡娴庢妧鏈紑鍙戝尯甯稿叴璺�96鍙�</span></p> + <p style="margin-top: 0;margin-bottom: 0;"><span lang="EN-US" class="x1111112">鐢佃瘽/浼犵湡锛�0513鈥�89191125</span></p> </div> </td> </tr> @@ -213,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' @@ -230,6 +293,7 @@ str:"https://ztms-mes.chinaztt.cn/#/pack?id=", qrData:[], diaPrintTab: false, + checkShow:false, multipleSelection: [], isCheck: false, dataway:{}, @@ -332,6 +396,8 @@ minWidth: 120 } }, + codeInfo:null, + startTime: null, } }, components: { @@ -353,6 +419,11 @@ text: '鏍囩鎵撳嵃', type: 'primary', fun: this.printLabel + }) + this.table.toolbar.push({ + text: '涓嬭浇瑁呯娓呭崟', + type: 'primary', + fun: this.downOrder }) } let arr = [] @@ -391,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: { @@ -407,7 +491,7 @@ style: `@page { margin:0; padding: 0; - size: 323px 210px; + size: 323px 210px landscape; } html{ zoom:100%; @@ -433,6 +517,7 @@ this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�') return } + console.log(this.multipleSelection) this.diaPrintTab = true this.multipleSelection.forEach(item=>{ const obj = { @@ -509,6 +594,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 +650,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> -- Gitblit v1.9.3