From 0042dbfd410064ebfab00826f927ed73448db5ec Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 21 五月 2024 14:53:20 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before into master
---
src/views/quality/Packaging_ledger/pack-fromadd.vue | 83 +++++++++++++++++++++++++++--------------
1 files changed, 55 insertions(+), 28 deletions(-)
diff --git a/src/views/quality/Packaging_ledger/pack-fromadd.vue b/src/views/quality/Packaging_ledger/pack-fromadd.vue
index 71b7eb5..6bf4000 100644
--- a/src/views/quality/Packaging_ledger/pack-fromadd.vue
+++ b/src/views/quality/Packaging_ledger/pack-fromadd.vue
@@ -1,7 +1,7 @@
<template>
<el-dialog
width="60%"
- title="鍙傛暟"
+ title="浜у搧搴撳瓨鏄庣粏"
top="5vh"
:visible.sync="innerVisible"
:show="currshowlist"
@@ -16,7 +16,7 @@
:options="options"
:ajaxFun="ajaxFun"
:paramObj="packageBoxIddata"
- :bottomOffset="350"
+ :bottomOffset="150"
ref="paramTable"
>
<template #toolbar></template>
@@ -43,7 +43,6 @@
data() {
return {
datalist:[],
- datalistid:"",
ajaxFun: dataadd,
currentRow: false,
typeOptions: [],
@@ -78,6 +77,15 @@
// 鏍囬
column: [
{
+ minWidth: '120',
+ prop: 'customerOrderNo',
+ label: '鍚堝悓鍙�',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ },
+ {
minWidth: 'code',
prop: 'product',
label: '浜у搧',
@@ -111,7 +119,43 @@
sort: true,
isTrue: true,
isSearch: true,
- searchInfoType: 'datetimerange'
+ searchInfoType: 'text'
+ },
+ {
+ minWidth: '120',
+ prop: 'outBatchNo',
+ label: '鎵规鍙�',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ },
+ {
+ minWidth: '120',
+ prop: 'number',
+ label: '鏁伴噺',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ },
+ {
+ minWidth: '120',
+ prop: 'locNo',
+ label: '搴撲綅缂栧彿',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ },
+ {
+ minWidth: '120',
+ prop: 'locName',
+ label: '搴撲綅鍚嶇О',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
},
],
},
@@ -123,8 +167,12 @@
},
watch: {
currshowlist() {
- console.log(22211);
this.innerVisible = this.currshowlist
+ if(this.currshowlist){
+ this.$nextTick(() => {
+ this.getData()
+ });
+ }
}
},
computed: {
@@ -134,32 +182,12 @@
this.getParamType()
},
methods: {
- // 鑾峰彇鏁版嵁鍒楄〃
- getData() {
+ // 鑾峰彇鏁版嵁鍒楄〃
+ getData() {
this.$refs.paramTable.getDataList()
- },
- handleSelectionChange(val){
- let data = val
- data.forEach(el => {
- this.datalistid = el
- });
- },
- saveSelectRow() {
- console.log(this.packageBoxIddata,"123");
- // saveList ({customerId:this.datalistid.id,contractNo:this.datalistid.contractNo}).then((res =>{
- // console.log(res);
- // if (res.status === 200) {
- // this.$message.success('鏂板鎴愬姛')
- // }else{
- // this.$message.error('鍒涘缓澶辫触')
- // }
- // }))
- this.innerVisible = false
- // this.$emit('handleSelectionChange',this.innerVisible )
},
handleSelectionChange(val){
this.datalist = val
- console.log(this.datalist,"鏁版嵁");
},
saveSelectRow(){
this.$emit('handleSelectionChange',this.datalist )
@@ -168,4 +196,3 @@
}
}
</script>
-
\ No newline at end of file
--
Gitblit v1.9.3