大屏

liuying

2024-12-01 6db85a1b10d891a3871775c2c555fd681cb7da34

大屏

 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">

 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 //改为查询库位上全部的库存
    });

 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 {

 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单ID" 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 ?? [];

 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%"

 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>

 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
};

// 暴露方法

 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
                //     });
                // });

                });


            }