From 67da82f0b0c24df5f19bbfcfec63801d9ae902d8 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 16:22:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/quality/Packaging_ledger/pack-fromadd.vue | 66 ++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 26 deletions(-)
diff --git a/src/views/quality/Packaging_ledger/pack-fromadd.vue b/src/views/quality/Packaging_ledger/pack-fromadd.vue
index e27e45a..b280ee7 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"
@@ -43,7 +43,6 @@
data() {
return {
datalist:[],
- datalistid:"",
ajaxFun: dataadd,
currentRow: false,
typeOptions: [],
@@ -111,7 +110,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,7 +158,6 @@
},
watch: {
currshowlist() {
- console.log(22211);
this.innerVisible = this.currshowlist
}
},
@@ -134,32 +168,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 )
--
Gitblit v1.9.3