From bb1d5504c001edc22eb903ff61d92b21ec62e665 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期六, 09 十二月 2023 18:42:15 +0800
Subject: [PATCH] modified: src/views/quality/Packaging_ledger/index.vue modified: src/views/quality/Packaging_ledger/pack-fromadd.vue modified: src/views/quality/finishedProductInspection/finishedProduct-form.vue modified: src/views/quality/finishedProductInspection/index.vue
---
src/views/quality/finishedProductInspection/index.vue | 2 +
src/views/quality/finishedProductInspection/finishedProduct-form.vue | 4 +-
src/views/quality/Packaging_ledger/index.vue | 30 +++++++++++----
src/views/quality/Packaging_ledger/pack-fromadd.vue | 55 +++++++++++++++++++++------
4 files changed, 68 insertions(+), 23 deletions(-)
diff --git a/src/views/quality/Packaging_ledger/index.vue b/src/views/quality/Packaging_ledger/index.vue
index 542ea79..76c49df 100644
--- a/src/views/quality/Packaging_ledger/index.vue
+++ b/src/views/quality/Packaging_ledger/index.vue
@@ -71,23 +71,34 @@
<el-table-column
label="浜у搧"
prop="product"
+ show-overflow-tooltip
align="center"
/>
<el-table-column
label="浜у搧缂栧彿"
prop="productNo"
+ show-overflow-tooltip
+ align="center"
+ >
+ </el-table-column>
+ <el-table-column
+ label="鎵规鍙�"
+ prop="outBatchNo"
+ show-overflow-tooltip
align="center"
>
</el-table-column>
<el-table-column
label="瑙勬牸鍨嬪彿"
prop="specs"
+ show-overflow-tooltip
align="center"
>
</el-table-column>
<el-table-column
label="鍗曚綅"
prop="unit"
+ show-overflow-tooltip
align="center"
>
</el-table-column>
@@ -95,19 +106,16 @@
label="鏁伴噺"
prop="number"
align="center"
+ show-overflow-tooltip
width="80"
- >
- <template slot-scope="scope">
- <el-input v-model="scope.row.number"></el-input>
- </template>
- </el-table-column>
+ ></el-table-column>
<el-table-column
fixed="right"
label="鎿嶄綔"
align="center"
width="80">
<template slot-scope="scope">
- <el-button @click="deleteadd(scope.row)" size="small">鍒犻櫎</el-button>
+ <el-button type="text" @click="deleteadd(scope.row)" icon="el-icon-delete" size="small">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -419,9 +427,15 @@
this.testStandardParams.forEach(el => {
el.packageBoxId =this.goid
});
+ console.log(this.testStandardParams);
+ return
saveList(this.testStandardParams).then((res) =>{
- this.$message.success('淇濆瓨鎴愬姛')
- this.rightquery()
+ if(res.status===200){
+ this.$message.success('淇濆瓨鎴愬姛')
+ this.rightquery()
+ }
+ }).catch(error=>{
+ console.error(error);
})
},
//鍒犻櫎
diff --git a/src/views/quality/Packaging_ledger/pack-fromadd.vue b/src/views/quality/Packaging_ledger/pack-fromadd.vue
index a720891..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'
},
],
},
@@ -133,16 +168,10 @@
this.getParamType()
},
methods: {
- // 鑾峰彇鏁版嵁鍒楄〃
- getData() {
- this.$refs.paramTable.getDataList()
- },
- handleSelectionChange(val){
- let data = val
- data.forEach(el => {
- this.datalistid = el
- });
- },
+ // 鑾峰彇鏁版嵁鍒楄〃
+ getData() {
+ this.$refs.paramTable.getDataList()
+ },
handleSelectionChange(val){
this.datalist = val
},
diff --git a/src/views/quality/finishedProductInspection/finishedProduct-form.vue b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
index c9e9c33..9a2abfa 100644
--- a/src/views/quality/finishedProductInspection/finishedProduct-form.vue
+++ b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -88,7 +88,7 @@
<el-form-item label="浜у搧鍚堟牸搴撲綅锛�" prop="locationId">
<el-select @change="changeLocation" clearable style="width:100%"
v-model="processInspectVo.locationId" placeholder="璇烽�夋嫨鍚堟牸搴撲綅"
- autocomplete="off">
+ :disabled="resultVal!=null && processInspectVo.id!=null" autocomplete="off">
<el-option v-for="(item,i) in locationList" :key="i"
:label="item.locName+'-'+item.locNo" :value="item.id"></el-option>
</el-select>
@@ -294,7 +294,7 @@
mounted() {
this.getDeviceList()
this.processInspectVo.id = this.$route.query.id
- this.resultVal = this.$route.query.resultVal
+ this.resultVal = this.$route.params.resultVal
if(this.resultVal == null){
let val = sessionStorage.getItem("finished-resultVal-"+this.processInspectVo.id);
val == undefined ? this.resultVal=null : this.resultVal = val
diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index 696ffb0..ac81d80 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -285,6 +285,8 @@
name: 'finishedProductForm',
query: {
id: row == null ? null : row.id,
+ },
+ params: {
resultVal: row == null ? null : row.result
}
})
--
Gitblit v1.9.3