From 164f2cf0a8d85a2ebd2955f8f322d5f6bb4d3857 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 23 12月 2024 09:23:58 +0800
Subject: [PATCH] 22
---
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeedKittingNg/index.vue | 62 ++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 10 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeedKittingNg/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeedKittingNg/index.vue
index fdf27f2..627b29d 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeedKittingNg/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeedKittingNg/index.vue
@@ -21,7 +21,8 @@
<el-form-item>
<el-button-group style="display: flex; align-items: center">
<el-button size="large" type="primary" icon="ele-Search" @click="handleQuery"> 鏌ヨ </el-button>
- <el-button size="large" icon="ele-Finished" @click="ConfirmNg"> 鏍囪Ng </el-button>
+ <el-button size="large" icon="ele-Finished" @click="ConfirmNg"> 鏍囪NG骞朵笅绾� </el-button>
+ <el-button size="large" icon="ele-Finished" @click="ConfirmNg2"> 姝ｅ父涓嬬嚎 </el-button>
<!--
<el-button icon="ele-ZoomIn" @click="changeAdvanceQueryUI" v-if="!showAdvanceQueryUI" style="margin-left:5px;"> 楂樼骇鏌ヨ </el-button>
<el-button icon="ele-ZoomOut" @click="changeAdvanceQueryUI" v-if="showAdvanceQueryUI" style="margin-left:5px;"> 闅愯棌 </el-button> -->
@@ -52,11 +53,14 @@
p-id="4304"
></path>
</svg>
- <p class="okText">{{ isSuccess }}</p>
+ <p class="no_okText">{{ isSuccess }}</p>
</div>
</div>
<ul>
-
+ <li>
+ <span class="text_left">鍖呰缂栧彿:</span>
+ <span class="text_rt">{{ tableData.packageCode }}</span>
+ </li>
<li>
<span class="text_left">鎵规鍙�:</span>
<span class="text_rt">{{ tableData.planNo }}</span>
@@ -148,7 +152,7 @@
import printDialog from '/@/views/system/print/component/hiprint/preview.vue';
import editDialog from '/@/views/main/WmsBase/wmsSubstituteGood/component/editDialog.vue';
import { pageWmsSubstituteGood, deleteWmsSubstituteGood } from '/@/api/main/WmsBase/wmsSubstituteGood';
-import { ShortageList, ValdateQiTao ,ConfirmNgF} from '/@/api/main/ReportCenter/wmsStockQuan';
+import { ShortageList, QueryPackage ,ConfirmNgF} from '/@/api/main/ReportCenter/wmsStockQuan_new';
const showAdvanceQueryUI = ref(false);
const printDialogRef = ref();
const editDialogRef = ref();
@@ -219,7 +223,7 @@
}
console.log('鏌ヨ');
loading.value = true;
- var res = await ValdateQiTao(Object.assign(queryParams.value, tableParams.value));
+ var res = await QueryPackage(Object.assign(queryParams.value, tableParams.value));
queryParams.value.packageCode = '';
handleResponse(res);
@@ -250,7 +254,8 @@
const ConfirmNg = () => {
- ElMessageBox.confirm("鏄惁纭鏍囪Ng锛�", "鎻愮ず", {
+ tableData.value.isNG =true
+ ElMessageBox.confirm("鏄惁纭鏍囪NG骞朵笅绾匡紵", "鎻愮ず", {
confirmButtonText: "纭",
cancelButtonText: "鍙栨秷",
type: "warning"
@@ -260,11 +265,35 @@
...tableData.value,
})
.then((res) => {
- if (res.code == 200) {
- ElMessage.success("鏍囪鎴愬姛");
+ //debugger
+ if (res.data.code == 200) {
+ ElMessage.success("鏍囪NG骞朵笅绾挎垚鍔�");
tableData.value ={}
} else {
- ElMessage.error(`澶辫触${res.code}:${JSON.stringify(res.message)}`);
+ ElMessage.error(`澶辫触${res.data.code}:${JSON.stringify(res.data.message)}`);
+ }
+ });
+ })
+};
+
+const ConfirmNg2 = () => {
+ tableData.value.isNG =false
+ ElMessageBox.confirm("鏄惁纭姝ｅ父涓嬬嚎锛�", "鎻愮ず", {
+ confirmButtonText: "纭",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ })
+ .then(() => {
+ ConfirmNgF({
+ ...tableData.value,
+ })
+ .then((res) => {
+ //debugger
+ if (res.data.code == 200) {
+ ElMessage.success("姝ｅ父涓嬬嚎鎴愬姛");
+ tableData.value ={}
+ } else {
+ ElMessage.error(`澶辫触${res.data.code}:${JSON.stringify(res.data.message)}`);
}
});
})
@@ -287,6 +316,7 @@
margin: 0;
padding: 0;
li {
+ margin-top: 20px;
display: block;
line-height: 30px;
text-align: left;
@@ -299,16 +329,28 @@
}
.text_left {
font-weight: 700;
+ font-size: 40px; /* 璋冩暣瀛椾綋澶у皬 */
+}
+.text_rt {
+ font-weight: 700;
+ color: #00B2EE; /* 璁剧疆鍥炬爣棰滆壊 */
+ font-size: 40px; /* 璋冩暣瀛椾綋澶у皬 */
}
.my-icon {
font-size: 36px; /* 璋冩暣瀛椾綋澶у皬 */
color: #00ff11; /* 璁剧疆鍥炬爣棰滆壊 */
}
.titleTip {
+ font-weight: 700;
text-align: center;
- font-size: 36px; /* 璋冩暣瀛椾綋澶у皬 */
+ font-size: 60px; /* 璋冩暣瀛椾綋澶у皬 */
.okText {
margin-bottom: 20px;
+ color: #52C41A; /* 璁剧疆鍥炬爣棰滆壊 */
+ }
+ .no_okText {
+ margin-bottom: 20px;
+ color: #E84335; /* 璁剧疆鍥炬爣棰滆壊 */
}
}
</style>
--
Gitblit v1.9.3