From e969c1f0523c69fe854fdcad7d8d8e2da6dcf30d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 28 十一月 2023 17:44:53 +0800
Subject: [PATCH] modified: src/views/product/workbench/feed-form.vue modified: src/views/product/workbench/feed-pane.vue modified: src/views/warehouse/pallettransports/index.vue modified: vue.config.js
---
src/views/product/workbench/feed-pane.vue | 12 +++---
vue.config.js | 6 +-
src/views/warehouse/pallettransports/index.vue | 42 ++++++++++----------
src/views/product/workbench/feed-form.vue | 14 +++---
4 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/src/views/product/workbench/feed-form.vue b/src/views/product/workbench/feed-form.vue
index e895b0a..ccfa65d 100644
--- a/src/views/product/workbench/feed-form.vue
+++ b/src/views/product/workbench/feed-form.vue
@@ -29,10 +29,10 @@
>
</el-table-column>
<el-table-column
- prop="partDescription"
+ prop="partName"
header-align="center"
align="center"
- label="闆朵欢鎻忚堪"
+ label="闆朵欢"
>
</el-table-column>
<el-table-column
@@ -205,13 +205,13 @@
getCheckRawPart(partNoList).then((response) => {
if (response.data.code === 0) {
// 闇�瑕佸瘑鐮佺‘璁ゆ儏鍐�
- if (response.data.data.success === false) {
- this.messages = response.data.data.message
- this.onnerVisible = true
- } else {
+ //if (response.data.data.success === false) {
+ // this.messages = response.data.data.message
+ // this.onnerVisible = true
+ //} else {
// 涓嶉渶瑕佸瘑鐮� 鐩存帴鎶曟枡
this.saveFeed()
- }
+ //}
}
})
},
diff --git a/src/views/product/workbench/feed-pane.vue b/src/views/product/workbench/feed-pane.vue
index 52b123f..743e9a2 100644
--- a/src/views/product/workbench/feed-pane.vue
+++ b/src/views/product/workbench/feed-pane.vue
@@ -229,16 +229,16 @@
</template>
</el-table-column> -->
<el-table-column
- label="闆朵欢鎻忚堪"
- prop="partDescription"
+ label="闆朵欢"
+ prop="partName"
align="center" show-overflow-tooltip
>
<template slot="header">
- <div style="line-height: 14px;">闆朵欢鎻忚堪</div>
+ <div style="line-height: 14px;">闆朵欢</div>
<div class="th" @click.stop>
<el-input
type="text"
- v-model="queryParamTwo.partDescription"
+ v-model="queryParamTwo.partName"
@keyup.enter.native="handleStockList"
clearable
@clear="handleStockList"
@@ -247,7 +247,7 @@
</div>
</template>
<template slot-scope="scope">
- <span>{{ scope.row.partDescription }}</span>
+ <span>{{ scope.row.partName }}</span>
</template>
</el-table-column>
<el-table-column label="IFS鎵规鍙�" prop="ifsBatchNo" align="center">
@@ -1202,7 +1202,7 @@
:show-overflow-tooltip="true"
>
<template slot="header" slot-scope="scope">
- <div style="line-height: 14px;">闆朵欢鎻忚堪</div>
+ <div style="line-height: 14px;">闆朵欢</div>
<div class="th" @click.stop>
<el-input
type="text"
diff --git a/src/views/warehouse/pallettransports/index.vue b/src/views/warehouse/pallettransports/index.vue
index b529d04..606ff6a 100644
--- a/src/views/warehouse/pallettransports/index.vue
+++ b/src/views/warehouse/pallettransports/index.vue
@@ -215,6 +215,7 @@
url: ''
},
WorkOrder:{},
+ datalistAPI:'',
prelang: 'pallettransports',
options: {
height: 300, // 榛樿楂樺害-涓轰簡琛ㄥご鍥哄畾
@@ -576,6 +577,7 @@
} else {
this.$message.error('娣诲姞绉诲簱鏄庣粏澶辫触')
}
+ this.palletTransportsMaterialSelectionChange()
})
.catch(() => {
})
@@ -704,27 +706,25 @@
},
palletTransportsMaterialSelectionChange(val) {
this.palletTransportsMaterialMultipleSelection = val
- let nn =[]
- this.palletTransportsMaterialMultipleSelection.forEach(el =>{nn.push(el.id)})
- let xx = nn[nn.length - 1];
- console.log(xx);
- console.log(this.currPalletTransportsRow.id,"榛樿");
- this.palletTransportsDetailData = []
- if (xx) {
- selectAll({transportsId:this.currPalletTransportsRow.id,transportsMaterialId:xx}).then((res) =>{
- console.log(res.data.data);
- this.palletTransportsDetailData.push(res.data.data)})
- }
- // if (this.palletTransportsMaterialMultipleSelection.length > 0) {
- // const currPalletTransportsMaterial = this
- // .palletTransportsMaterialMultipleSelection[
- // this.palletTransportsMaterialMultipleSelection.length - 1
- // ]
- // this.materialRow = currPalletTransportsMaterial
- // } else {
- // this.materialRow = null
- // }
- // this.getPalletTransportsDetailData()
+ let ids =[]
+ this.palletTransportsMaterialMultipleSelection.forEach(el =>{ids.push(el.id)})
+ let pId = ids.length>0 ? [ids.length - 1] : null;
+ console.log(pId);
+ if(pId!=null){
+ selectAll({
+ transportsId:this.currPalletTransportsRow.id,
+ transportsMaterialId: pId
+ }).then((res) =>{
+ console.log(res);
+ if(res.status===200 && res.data.data!=null){
+ this.palletTransportsDetailData.push(res.data.data)
+ }else{
+ this.palletTransportsDetailData = []
+ }
+ })
+ }else{
+ this.palletTransportsDetailData = []
+ }
},
palletTransportsDetailSelectionChange(val) {
this.palletTransportsDetailMultipleSelection = val
diff --git a/vue.config.js b/vue.config.js
index 6cd7d69..cd548ee 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,12 +2,12 @@
* 閰嶇疆鍙傝��:
* https://cli.vuejs.org/zh/config/
*/
-const url = 'http://192.168.2.7:9999'
-// const url = 'http://192.168.32.45:9999'
+// const url = 'http://192.168.2.7:9999'
+//const url = 'http://192.168.32.45:9999'
// const url = 'http://192.168.0.23:9999'
// const url = 'http://192.168.83.249:9999'
-// const url = 'http://localhost:9999'
+ const url = 'http://localhost:9999'
// const url = 'http://ztt-gateway:9999'
const localUrl = 'http://localhost:8089'
--
Gitblit v1.9.3