From 570046df69aeffbffb3efe8ddecaf523ca492a46 Mon Sep 17 00:00:00 2001 From: zongzhibin <zongzhibin@weben-smart.com> Date: 周二, 26 11月 2024 09:15:39 +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 | 128 +++++++++++++++--------------------------- 1 files changed, 46 insertions(+), 82 deletions(-) diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsOrderPurchase/component/openAllprop.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/component/openAllprop.vue similarity index 90% rename from LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsOrderPurchase/component/openAllprop.vue rename to LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/component/openAllprop.vue index edd6923..407a34e 100644 --- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsOrderPurchase/component/openAllprop.vue +++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/component/openAllprop.vue @@ -258,11 +258,11 @@ </template> </el-dialog> <!-- 鍗曡鎯� --> - <el-drawer v-model="drawerVisible" :title="`${detailForm.poId}璁㈠崟璇︽儏`" direction="rtl" size="80%" @close="handleDrawerClose"> + <el-drawer v-model="drawerVisible" :title="`${detailForm.poId}鐗╂枡璇︽儏`" direction="rtl" size="80%" @close="handleDrawerClose"> <template #title> <div class="slot_title"> <div class="title_orderNo">{{ title }}</div> - <div>璁㈠崟璇︽儏</div> + <div>鐗╂枡璇︽儏</div> </div> </template> @@ -273,8 +273,8 @@ <el-form :model="detailForm"> <el-row> <el-col :span="6"> - <el-form-item label="鐗╂枡缂栧彿"> - <el-input v-model="detailForm.materialCode" clearable placeholder="璇疯緭鍏ョ墿鏂欑紪鍙�" /> + <el-form-item label="閮ㄤ欢鍚嶇О"> + <el-input v-model="detailForm.detailName" clearable placeholder="璇疯緭鍏ラ儴浠跺悕绉�" /> </el-form-item> </el-col> <el-col :span="4"> @@ -294,64 +294,34 @@ <!-- <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="materialCode" label="鐗╂枡缂栧彿" fixed="left" show-overflow-tooltip="" /> - <el-table-column prop="materialName" label="鐗╂枡鍚嶇О" show-overflow-tooltip="" /> - <el-table-column prop="poLineNumber" label="琛屽彿" show-overflow-tooltip="" /> - - <el-table-column prop="poDetailStatus" label="鐘舵��" 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=""> <template #default="scope"> - <el-tag :type="getTypeStatus(1, getEnumDesc(scope.row.poDetailStatus, getEnumPoDetailStatusData_Index))">{{ - getEnumDesc(scope.row.poDetailStatus, getEnumPoDetailStatusData_Index) - }}</el-tag> + <el-tag>{{ getEnumDesc(scope.row.stockStatus, getEnumStockStatusData_Index) }}</el-tag> </template> </el-table-column> - - <el-table-column prop="quantity" label="鏁伴噺" show-overflow-tooltip="" /> - <el-table-column prop="goodsQuantity" label="宸叉敹鏁伴噺" show-overflow-tooltip="" /> - - <!-- <el-table-column - prop="createASNQuantity" - label="宸插垱寤篈SN鏁伴噺" min-width="110px" - show-overflow-tooltip="" - /> --> - - <!-- <el-table-column - prop="snp" - label="鏍囧寘鏁伴噺" - show-overflow-tooltip="" - /> --> - <!-- <el-table-column prop="erpOrderNo" label="ERP鍗曞彿" show-overflow-tooltip="" /> --> - <el-table-column prop="erpCode" label="ERP搴撳瓨鍦�" show-overflow-tooltip="" /> - - <!-- <el-table-column - prop="printQuantity" min-width="110px" - label="鏉$爜鎵撳嵃鏁伴噺" - show-overflow-tooltip="" - /> --> - - <!-- <el-table-column - prop="poDetailStatusName" - label="鐘舵�佸悕绉�" - show-overflow-tooltip="" - /> --> - <el-table-column prop="supplierCode" label="渚涘簲鍟嗙紪鍙�" show-overflow-tooltip="" /> - <el-table-column prop="supplierName" label="渚涘簲鍟嗗悕绉�" show-overflow-tooltip="" /> - <el-table-column prop="supplierBatch" min-width="100px" label="渚涘簲鍟嗘壒娆�" show-overflow-tooltip="" /> - <!-- <el-table-column prop="batch" min-width="100px" label="鎵规" show-overflow-tooltip="" /> --> - <el-table-column prop="unit" min-width="100px" label="閲囪喘鍗曚綅" show-overflow-tooltip="" /> - - <el-table-column prop="plannedStartTime" label="璁″垝寮�濮嬫椂闂�" min-width="130px" show-overflow-tooltip="" /> - <el-table-column prop="plannedEndTime" label="璁″垝缁撴潫鏃堕棿" min-width="130px" show-overflow-tooltip="" /> - - <el-table-column prop="projectNo" min-width="100px" label="椤圭洰鍙�" show-overflow-tooltip="" /> - - <!-- <el-table-column - prop="dock" - min-width="100px" - label="鏀惰揣閬撳彛" - show-overflow-tooltip="" - /> --> - + <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=""> + <template #default="scope"> + <el-tag>{{ getEnumDesc(scope.row.lockStatus, getEnumLockStatusData_Index) }}</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="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="" /> @@ -443,6 +413,8 @@ const hexiao = computed(() => props.hexiao); const loading = ref(false); +const getEnumStockStatusData_Index = ref<any>([]); +const getEnumLockStatusData_Index = ref<any>([]); // 鐧诲綍鐢ㄦ埛id // const LoginUserID = computed(() => store.state.login.userInfo.id || localCache.getCache("LoginUserID")) @@ -562,11 +534,10 @@ //鍒楄〃鐨勬暟鎹潯鏁� const totalItems = ref<number>(0); -//缂撳瓨鏋氫妇 -const enumList: any = cache.getCache('enumList'); -console.log(enumList.inEnumOrderType); +// //缂撳瓨鏋氫妇 +// const enumList: any = cache.getCache('enumList'); +// console.log(enumList.inEnumOrderType); -// .inEnumOrderType //鑾峰彇PO鍗曞垪琛� const getTabelData = () => { @@ -636,8 +607,8 @@ // -------------------鑾峰彇PO鍗曚笅鐗╂枡璇︽儏----------------------------------- //鍏ュ簱鍗曚笅鐗╂枡璇︽儏璇锋眰 const detailForm = ref({ - poId: '', - materialCode: '', + detailName: '', + packageCode: '', Page: 1, PageSize: 10, }); @@ -653,20 +624,17 @@ const openDrawer = async (type: number, scope: any = {}, entozhExcell?: any) => { detailForm.value.Page = 1; //bug:鐐圭紪杈�-鍐嶇偣璇︽儏 detailForm.value.PageSize = 10; //bug:鐐圭紪杈�-鍐嶇偣璇︽儏 - if (scope.purchaseNo) { - title.value = `${scope.purchaseNo}`; - } - if (scope.orderNo) { - title.value = `${scope.orderNo}`; + if (scope.packageCode) { + title.value = `${scope.packageCode}`; } drawerType.value = 'drawerAll'; drawerVisible.value = true; //褰撳墠鍏ュ簱鍗曞彿id - detailForm.value.poId = scope.id; + detailForm.value.orderId = scope.orderId; //鍏ュ簱鍗� - purchaseNo.value = scope.purchaseNo; + purchaseNo.value = scope.packageCode; debugger; - detailForm.value.poId = scope.id; + detailForm.value.packageCode = scope.packageCode; //鑾峰彇鐗╂枡鍒楄〃 if (detailForm.value.poId == '') { drawerList.value = []; @@ -676,13 +644,9 @@ //------------------鑾峰彇鐗╂枡鍒楄〃鐗╂枡鏄庣粏 getDetail(); //------------------鑾峰彇鐗╂枡鍒楄〃鐗╂枡鏄庣粏 - - getBusinessTypeData_Index.value = await handleSlectDataWmsBusinessType(moveType); //涓嬫媺璇诲彇涓氬姟绫诲瀷鎺ュ彛 create by liuwq - - getEnumDockData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('DockEnum')).data.result ?? []; - - getEnumPoDetailStatusData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('OrderStatusEnum')).data.result ?? []; - getEnumOrderTypeData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('OrderTypeEnum')).data.result ?? []; + getEnumStockStatusData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('StockStatusEnum')).data.result ?? []; + getEnumLockStatusData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('LockStatusEnum')).data.result ?? []; + //----------------鐗╂枡鏄庣粏 // 鏍规嵁鐘舵�佽浆涓枃 淇濈暀3浣嶅皬鏁� let scopetrans = JSON.parse(JSON.stringify(scope)); @@ -698,8 +662,8 @@ //鍏抽棴鎶藉眽 const handleDrawerClose = () => { detailForm.value = { - poId: '', - materialCode: '', + detailName: '', + packageCode: '', Page: 1, PageSize: 10, }; -- Gitblit v1.9.3