From c50aa7a3ca54b8b4b9ae419b18e4ab0a01018737 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 05 十二月 2023 18:43:41 +0800
Subject: [PATCH] 修复bug
---
src/views/plan/manufacturingorder/index.vue | 9 +++++++++
vue.config.js | 2 +-
src/views/product/workbench/productoutput-table.vue | 13 +++++++++++--
src/views/warehouse/pallettransports/index.vue | 8 ++++----
src/views/product/workbench/productoutput-list.vue | 8 ++++----
5 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index 9cd676f..9d42d58 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -464,6 +464,15 @@
isSearch: true,
searchInfoType: 'text'
},
+ {
+ minWidth: '120',
+ prop: 'scrapQty',
+ label: '鎶ュ簾鏁伴噺',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ },
{
minWidth: '120',
prop: 'remark',
diff --git a/src/views/product/workbench/productoutput-list.vue b/src/views/product/workbench/productoutput-list.vue
index 1cd3a4f..f4b8989 100644
--- a/src/views/product/workbench/productoutput-list.vue
+++ b/src/views/product/workbench/productoutput-list.vue
@@ -130,7 +130,7 @@
isSearch: true,
searchInfoType: 'text'
},
- {
+ /* {
minWidth: '100',
prop: 'checkStatus',
label: '妫�娴嬬姸鎬�',
@@ -152,8 +152,8 @@
optList: () => {
return this.checkStatusOptions
}
- },
- {
+ }, */
+ /* {
minWidth: '140',
prop: 'isQualified',
label: '妫�娴嬫槸鍚﹀悎鏍�',
@@ -198,7 +198,7 @@
optList: () => {
return this.booleanOptions
}
- },
+ }, */
{
minWidth: '140',
prop: 'remark',
diff --git a/src/views/product/workbench/productoutput-table.vue b/src/views/product/workbench/productoutput-table.vue
index b722f1f..db8b726 100644
--- a/src/views/product/workbench/productoutput-table.vue
+++ b/src/views/product/workbench/productoutput-table.vue
@@ -438,6 +438,15 @@
searchInfoType: 'text'
},
{
+ minWidth: '100',
+ prop: 'scrapQty',
+ label: '鎶ュ簾鏁伴噺',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ },
+ {
minWidth: '80',
prop: 'unit',
label: '鍗曚綅',
@@ -446,7 +455,7 @@
isSearch: true,
searchInfoType: 'text'
},
- {
+ /* {
minWidth: '100',
prop: 'checkStatus',
label: '妫�娴嬬姸鎬�',
@@ -537,7 +546,7 @@
optList: () => {
return this.booleanOptions
}
- },
+ }, */
{
minWidth: '140',
prop: 'remark',
diff --git a/src/views/warehouse/pallettransports/index.vue b/src/views/warehouse/pallettransports/index.vue
index 78fcdff..0cd60ad 100644
--- a/src/views/warehouse/pallettransports/index.vue
+++ b/src/views/warehouse/pallettransports/index.vue
@@ -78,10 +78,10 @@
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" width="100">
<template slot-scope="scope">
- <el-button v-show="!scope.row.canEdit" type="text" :disabled="scope.row.detailExistState"
- @click="scope.row.canEdit = true">缂栬緫</el-button>
- <el-button v-show="scope.row.canEdit" type="text" :disabled="scope.row.detailExistState"
- @click="updateMaterial(scope.row)">淇濆瓨</el-button>
+ <!-- <el-button v-show="!scope.row.canEdit" type="text" :disabled="scope.row.detailExistState"
+ @click="scope.row.canEdit = true">缂栬緫</el-button> -->
+ <!-- <el-button v-show="scope.row.canEdit" type="text" :disabled="scope.row.detailExistState"
+ @click="updateMaterial(scope.row)">淇濆瓨</el-button> -->
<el-button type="text" :disabled="scope.row.detailExistState"
@click="delMaterial(scope.row)">鍒犻櫎</el-button>
</template>
diff --git a/vue.config.js b/vue.config.js
index f313e55..d03924e 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -3,7 +3,7 @@
* https://cli.vuejs.org/zh/config/
*/
// const url = 'http://192.168.2.7:9999'
-const url = 'http://192.168.2.7: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'
--
Gitblit v1.9.3