From 901d81f1c56281bab87044d2ff562d8ed8601efa Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 11 三月 2024 09:25:17 +0800
Subject: [PATCH] 完成包装核对功能
---
vue.config.js | 4
src/api/quality/Packaging_ledger.js | 27 ++++++
package.json | 1
src/views/quality/Packaging_ledger/index.vue | 149 ++++++++++++++++++++++++++++++++++++
4 files changed, 176 insertions(+), 5 deletions(-)
diff --git a/package.json b/package.json
index 56764cc..ab9ef8f 100644
--- a/package.json
+++ b/package.json
@@ -35,6 +35,7 @@
"script-loader": "^0.7.2",
"sockjs-client": "^1.0.0",
"stomp-websocket": "^2.3.4-next",
+ "true-case-path": "^2.2.1",
"vue": "2.6.12",
"vue-axios": "^2.1.2",
"vue-barcode": "^1.3.0",
diff --git a/src/api/quality/Packaging_ledger.js b/src/api/quality/Packaging_ledger.js
index d58f894..8c5bc9a 100644
--- a/src/api/quality/Packaging_ledger.js
+++ b/src/api/quality/Packaging_ledger.js
@@ -1,3 +1,11 @@
+/***
+ * @Author licp lichunping@guanfang.com.cn
+ * @Date 2024-03-07 09:34:46
+ * @LastEditors licp lichunping@guanfang.com.cn
+ * @LastEditTime 2024-03-07 15:26:05
+ * @FilePath \mes-ocea-before\src\api\quality\Packaging_ledger.js
+ * @Description 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
import request from '@/router/axios'
export function pagedata(query) {
@@ -78,4 +86,21 @@
method: 'post',
data: obj
})
-}
\ No newline at end of file
+}
+
+export function qualityPackageBoxDetail(query) {
+ return request({
+ url: '/mes/qualityPackageBoxDetail/check',
+ method: 'post',
+ params: query
+ })
+}
+
+export function qualityPackageBox(query) {
+ return request({
+ url: '/mes/qualityPackageBox/packageList',
+ method: 'get',
+ params: query,
+ responseType: 'blob'
+ })
+}
diff --git a/src/views/quality/Packaging_ledger/index.vue b/src/views/quality/Packaging_ledger/index.vue
index d72861a..7f70b34 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
@@ -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 = []
@@ -390,6 +461,19 @@
diaPrintTab(newVal){
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)
}
}
},
@@ -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>
diff --git a/vue.config.js b/vue.config.js
index 2280c3d..2b66e9c 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -7,11 +7,11 @@
// const url = 'http://192.168.2.7:9999'
// const url = 'https://ztms-mes.chinaztt.cn/'
-const url = 'http://localhost:9999'
+const url = 'http://192.168.23.249:9999'
const localUrl = 'http://localhost:8089'
-//const localUrl = 'http://10.88.15.95:8089'
+// const localUrl = 'http://10.88.15.95:8089'
const CompressionWebpackPlugin = require('compression-webpack-plugin')
const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin')
const productionGzipExtensions = ['js', 'css']
--
Gitblit v1.9.3