From adf622258d11cff158aa62a0db40346a792b8d8a Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周日, 01 12月 2024 13:57:05 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine
---
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/component/openAllprop.vue | 105 ++++++++++++++++++++++++----------------------------
1 files changed, 48 insertions(+), 57 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/component/openAllprop.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/component/openAllprop.vue
index 32c0c1d..e5251c3 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/component/openAllprop.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/component/openAllprop.vue
@@ -272,9 +272,19 @@
<div class="msi-form">
<el-form :model="detailForm">
<el-row>
- <el-col :span="6">
+ <!-- <el-col :span="6">
<el-form-item label="閮ㄤ欢鍚嶇О">
<el-input v-model="detailForm.detailName" clearable placeholder="璇疯緭鍏ラ儴浠跺悕绉�" />
+ </el-form-item>
+ </el-col> -->
+ <!-- <el-col :span="6">
+ <el-form-item label="鎵规鍙�">
+ <el-input v-model="detailForm.planNo" clearable="" placeholder="璇疯緭鍏ユ壒娆″彿" />
+ </el-form-item>
+ </el-col> -->
+ <el-col :span="6">
+ <el-form-item label="鍖呰鍙�">
+ <el-input v-model="detailForm.packageCode" clearable="" placeholder="璇疯緭鍏ュ寘瑁呭彿" />
</el-form-item>
</el-col>
<el-col :span="4">
@@ -290,42 +300,47 @@
<div class="msi-content">
<!-- <p style="margin-bottom: 10px">鐗╂枡鏄庣粏</p> -->
<el-table :data="drawerList" border striped :max-height="480">
- <el-table-column fixed="left" type="index" label="搴忓彿" width="55" align="center" />
- <!-- <el-table-column prop="poId" label="PO鍗旾D" show-overflow-tooltip="" /> -->
- <!-- <el-table-column prop="poNo" label="PO鍗曞彿" show-overflow-tooltip="" /> -->
-
- <el-table-column prop="placeCode" label="搴撲綅缂栫爜" show-overflow-tooltip="" />
- <el-table-column prop="inTime" label="杩涘叆鏃堕棿" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" />
- <el-table-column prop="upi" label="閮ㄤ欢鏉＄爜" show-overflow-tooltip="" />
- <el-table-column prop="detailName" label="閮ㄤ欢鍚嶇О" show-overflow-tooltip="" />
- <el-table-column prop="planNo" label="鎵规" show-overflow-tooltip="" />
- <el-table-column prop="orderId" label="璁㈠崟鍙�" show-overflow-tooltip="" />
- <el-table-column prop="packageCode" label="鍖呰鍙�" show-overflow-tooltip="" />
- <el-table-column prop="length" label="闀�" show-overflow-tooltip="" />
- <el-table-column prop="width" label="瀹�" show-overflow-tooltip="" />
- <el-table-column prop="thk" label="鍘�" show-overflow-tooltip="" />
- <el-table-column prop="stockStatus" label="搴撳瓨鐘舵��" show-overflow-tooltip="">
+ <el-table-column label="搴忓彿" align="center" width="60" type="index" />
+ <el-table-column prop="packageCode" label="鍖呰鍙�" min-width="120"show-overflow-tooltip="" />
+ <el-table-column prop="info5" label="鐢熶骇鍗曞彿" show-overflow-tooltip="" />
+ <el-table-column prop="planNo" label="鎵规鍙�" show-overflow-tooltip="" />
+ <el-table-column prop="orderId" min-width="120" label="璁㈠崟鍙�" show-overflow-tooltip="" />
+ <!-- <el-table-column prop="areaCode" label="鎵�鍦ㄥ尯鍩�" show-overflow-tooltip="">
<template #default="scope">
- <el-tag>{{ getEnumDesc(scope.row.stockStatus, getEnumStockStatusData_Index) }}</el-tag>
+ <el-tag>{{ getEnumDesc(scope.row.areaCode, getEnumAreaCodeData_Index) }}</el-tag>
</template>
</el-table-column>
- <el-table-column prop="stockStatusName" label="搴撳瓨鐘舵�佸悕绉�" show-overflow-tooltip="" />
- <el-table-column prop="operReason" label="鎿嶄綔鍘熷洜" show-overflow-tooltip="" />
- <el-table-column prop="operUser" label="鎿嶄綔浜�" show-overflow-tooltip="" />
- <el-table-column prop="operTime" label="鎿嶄綔鏃堕棿" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" />
- <el-table-column prop="lockStatus" label="閿佸畾鐘舵��" show-overflow-tooltip="">
+ <el-table-column prop="upiStatus" label="鏉挎枡鐘舵��" show-overflow-tooltip="">
<template #default="scope">
- <el-tag>{{ getEnumDesc(scope.row.lockStatus, getEnumLockStatusData_Index) }}</el-tag>
+ <el-tag>{{ getEnumDesc(scope.row.upiStatus, getEnumUpiStatusData_Index) }}</el-tag>
+ </template>
+ </el-table-column> -->
+ <el-table-column prop="isQiBao" label="鏄惁榻愬寘" show-overflow-tooltip="">
+ <template #default="scope">
+ <el-tag v-if="scope.row.isQiBao"> 鏄� </el-tag>
+ <el-tag type="danger" v-else> 鍚� </el-tag>
</template>
</el-table-column>
- <el-table-column prop="lockReason" label="閿佸畾鍘熷洜" show-overflow-tooltip="" />
- <el-table-column prop="lockUser" label="閿佸畾浜�" show-overflow-tooltip="" />
- <el-table-column prop="lockTime" label="閿佸畾鏃堕棿" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" />
- <el-table-column prop="remarks" label="澶囨敞" show-overflow-tooltip="" />
+ <el-table-column prop="info1" label="绾哥闀�" show-overflow-tooltip="" />
+ <el-table-column prop="info2" label="绾哥瀹�" show-overflow-tooltip="" />
+ <el-table-column prop="info3" label="绾哥楂�" show-overflow-tooltip="" />
+ <el-table-column prop="info4" label="閿�鍞悎鍚屽崟鍙�" show-overflow-tooltip="" />
+ <el-table-column prop="info6" label="绗嚑鍖�" show-overflow-tooltip="" />
+ <el-table-column prop="info7" label="缁忛攢搴楀悕绉�" show-overflow-tooltip="" />
+ <el-table-column prop="info8" label="浜у搧鍚嶇О" show-overflow-tooltip="" />
+ <el-table-column prop="info10" label="瀹㈡埛鍚嶇О" show-overflow-tooltip="" />
+ <el-table-column prop="info11" label="鑷彁or鍙戣揣" show-overflow-tooltip="" />
+ <el-table-column prop="info12" label="鍖呰閮ㄤ欢鎬绘暟閲�" show-overflow-tooltip="" />
+ <el-table-column prop="info13" label="鍖呰闈㈢Н" show-overflow-tooltip="" />
<el-table-column prop="createTime" label="鍒涘缓鏃堕棿" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" />
<el-table-column prop="updateTime" label="淇敼鏃堕棿" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" />
<el-table-column prop="createUserName" label="鍒涘缓浜�" show-overflow-tooltip="" />
<el-table-column prop="updateUserName" label="淇敼浜�" show-overflow-tooltip="" />
+ <!-- <el-table-column prop="upiFlag" label="鏍囪" show-overflow-tooltip="">
+ <template #default="scope">
+ <el-tag>{{ getEnumDesc(scope.row.upiFlag, getEnumUpiFlagData_Index) }}</el-tag>
+ </template>
+ </el-table-column> -->
</el-table>
<Pagination :total="detailCount" v-model:page="detailForm.Page" v-model:limit="detailForm.PageSize" @pagination="getDetail" style="margin-top: 20px; text-align: center"></Pagination>
@@ -334,29 +349,8 @@
</div>
</el-drawer>
- <el-dialog v-model="outVisible2" title="SPA鑾峰彇" width="20%" @close="closeOutDialog2">
- <el-form :model="outerForm2" label-width="120px">
- <el-row style="font-size: 16px">
- <el-col :span="23">
- <el-form-item label="鍗曞彿:" required>
- <el-input v-model="outerForm2.purchaseNo" clearable placeholder="璇疯緭鍏ュ崟鍙�" />
- </el-form-item>
- </el-col>
- </el-row>
- </el-form>
-
- <template #footer>
- <span class="dialog-footer">
- <el-button @click="outVisible2 = false">鍙栨秷</el-button>
- <el-button type="primary" @click="getSapOrderPO">纭</el-button>
- </span>
- </template>
- </el-dialog>
-
<!-- 鎵撳嵃 -->
<print-table-ckd ref="printTableRef"></print-table-ckd>
-
- <printDialogTestStudent ref="printDialogRefTestStudent" :title="printTestStudentTitle" @reloadTable="handleQueryTestStudent" />
</div>
</template>
<script lang="ts" setup>
@@ -386,6 +380,7 @@
import { hiprint } from 'vue-plugin-hiprint';
import { SysPrintApi } from '/@/api-services/api';
import { SysPrint } from '/@/api-services/models';
+import { pageMes_Package_Gather } from '/@/api/main/WmsOrder/mes_Package_Gather';
const moveType = 10; //绉诲姩绫诲瀷 鍏ュ簱
const { proxy }: any = getCurrentInstance(); // 璁块棶瀹炰緥涓婁笅鏂� proxy鍚屾椂鏀寔寮�鍙� 绾夸笂鐜
@@ -627,17 +622,14 @@
const openDrawer = async (type: number, scope: any = {}, entozhExcell?: any) => {
detailForm.value.Page = 1; //bug:鐐圭紪杈�-鍐嶇偣璇︽儏
detailForm.value.PageSize = 10; //bug:鐐圭紪杈�-鍐嶇偣璇︽儏
- if (scope.orderId) {
- title.value = `${scope.orderId}`;
+ if (scope.info5) {
+ title.value = `${scope.info5}`;
}
drawerType.value = 'drawerAll';
drawerVisible.value = true;
- //褰撳墠鍏ュ簱鍗曞彿id
- detailForm.value.orderId = scope.orderId;
- //鍏ュ簱鍗�
- purchaseNo.value = scope.orderId;
+ purchaseNo.value = scope.info5;
debugger;
- detailForm.value.orderId = scope.orderId;
+ detailForm.value.info5 = scope.info5;
//鑾峰彇鐗╂枡鍒楄〃
if (detailForm.value.poId == '') {
drawerList.value = [];
@@ -694,8 +686,7 @@
//鑾峰彇鍏ュ簱鍗曚笅鐗╂枡璇︽儏
const getDetail = async (callback?: any) => {
loading.value = true;
-
- var res = await pageWmsOrderPurchaseDetails(Object.assign(detailForm.value));
+ var res = await pageMes_Package_Gather(Object.assign(detailForm.value));
if (callback == 1) {
//缂栬緫鍏ュ彛
warehousOrderDetails.value = res.data.result?.items ?? [];
--
Gitblit v1.9.3