From 6db85a1b10d891a3871775c2c555fd681cb7da34 Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周日, 01 12月 2024 12:09:53 +0800
Subject: [PATCH] 大屏
---
LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/index.vue | 11 +--
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/shortageList/component/openAllprop.vue | 2
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/index.vue | 2
LuLiScreen/index3.html | 25 ++++----
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/component/openAllprop.vue | 105 ++++++++++++++++-------------------
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeedKitting/index.vue | 13 ----
LA24030_LuLiPackageLine_Web/src/components/printTableCkd.vue | 7 +-
LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/component/propDetail.vue | 8 +-
8 files changed, 73 insertions(+), 100 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Web/src/components/printTableCkd.vue b/LA24030_LuLiPackageLine_Web/src/components/printTableCkd.vue
index a11bf19..79b2d9f 100644
--- a/LA24030_LuLiPackageLine_Web/src/components/printTableCkd.vue
+++ b/LA24030_LuLiPackageLine_Web/src/components/printTableCkd.vue
@@ -41,17 +41,16 @@
<table cellspacing="0" cellpadding="0">
<tr class="middle_first">
<td class="middle_tree">缂栧彿</td>
- <td class="middle_one">鏉愭枡</td>
+ <td class="middle_two">鎵规</td>
<td class="middle_two">閮ㄤ欢鍚嶇О</td>
<td class="middle_four">灏哄</td>
<td class="middle_one">閮ㄤ欢鏉＄爜</td>
</tr>
<tr class="middle_first" v-for="(item, index) in itemW" :key="index">
<td class="middle_tree">{{ item.num }}</td>
-
- <td class="middle_one">
+ <td class="middle_two">
<div>
- <!-- {{ item.planNo }} -->
+ {{ item.planNo }}
</div>
</td>
<td class="middle_two">
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/component/propDetail.vue b/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/component/propDetail.vue
index a57b80b..6e277de 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/component/propDetail.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/component/propDetail.vue
@@ -3,10 +3,9 @@
<el-dialog v-model="dialogVisible" width="70%" @close="closeDialog">
<template #header>
<div style="color: #fff">
- <span>搴撲綅璇︽儏</span>
+ <span>搴撲綅{{placeCode}}璇︽儏 </span>
</div>
</template>
- <!-- <p >瀹瑰櫒缂栧彿锛歿{ containerNo }}</p> -->
<el-table ref="tableRefWmsStockQuan" :data="materialList" style="width: 100%" tooltip-effect="light" row-key="id" border="">
<el-table-column type="index" label="搴忓彿" width="55" align="center"/>
<el-table-column prop="placeCode" label="搴撲綅缂栫爜" show-overflow-tooltip="" />
@@ -64,11 +63,9 @@
const getEnumStockStatusData_Index = ref<any>([]);
//搴撲綅缂栧彿
-const containerNo = ref('');
+const placeCode = ref('');
const dialogVisible = ref(false);
const materialList = ref<any>([]);
-const getEnumPlaceStatusData_Index = ref<any>([]);
-const getEnumQCStatusData_Index = ref<any>([]);
const getEnumLockStatusData_Index = ref<any>([]);
//鎵撳紑绐楀彛
@@ -76,6 +73,7 @@
getEnumStockStatusData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('StockStatusEnum')).data.result ?? [];
getEnumLockStatusData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('LockStatusEnum')).data.result ?? [];
debugger
+placeCode.value =type.placeCode
var res = await listWmsStockQuan({
placeCode: type.placeCode //鏀逛负鏌ヨ搴撲綅涓婂叏閮ㄧ殑搴撳瓨
});
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/index.vue
index aa3c864..db71e2e 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/index.vue
@@ -68,7 +68,7 @@
</div>
<div class="row rowMy1">
<div class="cell" v-for="(cell, cellIndex) in item.data" :key="cellIndex" v-show="cellIndex >= 20 && cellIndex < 40">
- <span class="textK" :style="{ background: setBgColor(cell.placeStatus), boxShadow: '0 1px 1px' + setBgColor(cell.placeStatus) }">
+ <span class="textK" :style="{ background: setBgColor(cell.placeStatus), boxShadow: '0 1px 1px' + setBgColor(cell.placeStatus) }" @click="handleClick(cell)">
<!-- {{ cell.laneNo }} -->
{{ cell.placeCode }}
<!-- {{ cell.layerNo }}{{ cell.columnNo }} -->
@@ -77,7 +77,7 @@
</div>
<div class="row rowMy2">
<div class="cell" v-for="(cell, cellIndex) in item.data" :key="cellIndex" v-show="cellIndex >= 40 && cellIndex <= 60">
- <span class="textK" :style="{ background: setBgColor(cell.placeStatus), boxShadow: '0 1px 1px' + setBgColor(cell.placeStatus) }">
+ <span class="textK" :style="{ background: setBgColor(cell.placeStatus), boxShadow: '0 1px 1px' + setBgColor(cell.placeStatus) }" @click="handleClick(cell)">
<!-- {{ cell.laneNo }} -->
{{ cell.placeCode }}
<!-- {{ cell.layerNo }}{{ cell.columnNo }} -->
@@ -403,8 +403,7 @@
const dialogVisible = ref(false); // 寮规鍙鎬�
-const handleClick = (row: any, column: any) => {
- console.log(row, column);
+const handleClick = (row: any) => {
proxy.$refs['propDetailRef'].openDialog(row);
};
@@ -433,12 +432,12 @@
}
.cell {
- border: 1px solid gray; /* 姣忎釜鏍煎瓙鐨勯粦绾� */
+ border: 1px solid #c1c1c1; /* 姣忎釜鏍煎瓙鐨勯粦绾� */
height: 50px; /* 姣忎釜鏍煎瓙鐨勯珮搴� */
display: inline-block;
justify-content: center;
align-items: center; /* 灞呬腑鏄剧ず鍐呭 */
- width: 25px;
+ width: 49px;
}
.rowMy0 {
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 ?? [];
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/index.vue
index d173fd4..6c4ed12 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/index.vue
@@ -143,7 +143,7 @@
<!-- 鍙充晶琛ㄦ牸 -->
<div class="right-table">
- <p class="text-xtiny">缂哄鍒楄〃</p>
+ <!-- <p class="text-xtiny">缂哄鍒楄〃</p> -->
<el-table
:data="newTableData"
style="width: 100%"
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeedKitting/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeedKitting/index.vue
index bd0662c..bff488e 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeedKitting/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeedKitting/index.vue
@@ -56,15 +56,6 @@
</div>
</div>
<ul>
- <li>
- <span class="text_left">閮ㄤ欢鏉＄爜:</span>
- <span class="text_rt">{{ tableData.upi }}</span>
- </li>
-
- <li>
- <span class="text_left">閮ㄤ欢鍚嶇О:</span>
- <span class="text_rt">{{ tableData.detailName }}</span>
- </li>
<li>
<span class="text_left">鎵规鍙�:</span>
@@ -94,10 +85,6 @@
<li>
<span class="text_left">绗嚑鍖�:</span>
<span class="text_rt">{{ tableData.info6 }}</span>
- </li>
- <li>
- <span class="text_left">缁忛攢搴楀悕绉�:</span>
- <span class="text_rt">{{ tableData.info7 }}</span>
</li>
<li>
<span class="text_left">浜у搧鍚嶇О:</span>
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/shortageList/component/openAllprop.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/shortageList/component/openAllprop.vue
index e4169bc..4fe65c0 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/shortageList/component/openAllprop.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/shortageList/component/openAllprop.vue
@@ -730,8 +730,6 @@
let itemSubTitle = ref<any[]>([]);
const handleHtmlPrint = () => {
proxy.$refs['printTableRef'].printHd('缂轰欢娓呭崟', {}, drawerList.value); //deltailList
-
- // proxy.$refs['printTableRef'].printHd('缂轰欢娓呭崟', itemSubTitle.value, drawerList.value); //deltailList
};
// 鏆撮湶鏂规硶
diff --git a/LuLiScreen/index3.html b/LuLiScreen/index3.html
index 7da296d..1267a97 100644
--- a/LuLiScreen/index3.html
+++ b/LuLiScreen/index3.html
@@ -261,6 +261,11 @@
</li>`;
});
$('#idList3').append(listItems1);
+ $('.dowebok2').liMarquee({
+ direction: 'up',
+ scrollamount: 20,
+ runshort: false
+ });
}
});
@@ -297,19 +302,15 @@
}
});
- // $(function () {
- // $('.dowebok1').liMarquee({
- // direction: 'up',
- // scrollamount:20,
- // runshort: false
- // });
+ $(function () {
+ // $('.dowebok1').liMarquee({
+ // direction: 'up',
+ // scrollamount:20,
+ // runshort: false
+ // });
- // $('.dowebok2').liMarquee({
- // direction: 'up',
- // scrollamount:20,
- // runshort: false
- // });
- // });
+
+ });
}
--
Gitblit v1.9.3