From 70151032826593bee589b26132086deab58fc74d Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 07 十二月 2023 13:15:01 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/plan/manufacturingorder/index.vue | 1 +
vue.config.js | 3 ++-
src/views/warehouse/pallettransports/index.vue | 11 ++++++-----
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index 70eff09..0966fcf 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -1446,6 +1446,7 @@
},
// table鑷甫浜嬩欢
handleSelectionChange(val) {
+ console.log(val,"涓�琛�");
let orderData = []
orderData =val.map( el =>{
return{
diff --git a/src/views/warehouse/pallettransports/index.vue b/src/views/warehouse/pallettransports/index.vue
index caff534..d09ac3f 100644
--- a/src/views/warehouse/pallettransports/index.vue
+++ b/src/views/warehouse/pallettransports/index.vue
@@ -663,15 +663,15 @@
},
// 鍒犻櫎绉诲簱鏄庣粏
delDetail(row) {
- /* const delRow = this.palletTransportsDetailData.find((item) => {
+ const delRow = this.palletTransportsDetailData.find((item) => {
return item.id === row.id
- }) */
-
+ })
delPalletTransportsDetailObj(row.id).then((response) => {
const resData = response.data
if (resData.code === 0) {
- // const findRowIndex = this.palletTransportsDetailData.indexOf(delRow)
- // this.palletTransportsDetailData.splice(findRowIndex, 1)
+ const findRowIndex = this.palletTransportsDetailData.indexOf(delRow)
+ // console.log("ttttt",findRowIndex);
+ this.palletTransportsDetailData.splice(findRowIndex, 1)
this.$message.success('绉诲簱鏄庣粏鍒犻櫎鎴愬姛')
// this.getPalletTransportsMaterialData()
const currRow = this.currPalletTransportsRow
@@ -705,6 +705,7 @@
if (resData.code === 0) {
this.$message.success('鎵ц鎴愬姛')
// this.getPalletTransportsMaterialData()
+ this.palletTransportsDetailData=[]
const currRow = this.currPalletTransportsRow
this.getPallettransportsData().then(() => {
if (currRow) {
diff --git a/vue.config.js b/vue.config.js
index d03924e..95588b2 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -3,11 +3,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://localhost:9999'
+// const url = 'http://localhost:9999'
// const url = 'http://ztt-gateway:9999'
const localUrl = 'http://localhost:8089'
--
Gitblit v1.9.3