liuying
2024-12-01 ead79c455934f654d4ae5fa6f295160fe0304a0b
打印
已修改6个文件
58 ■■■■ 文件已修改
LA24030_LuLiPackageLine_Web/src/components/printTableCkd.vue 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/index.vue 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/shortageList/component/openAllprop.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanOutput.cs 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LuLiScreen/index.html 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LA24030_LuLiPackageLine_Web/src/components/printTableCkd.vue
@@ -41,7 +41,7 @@
                <table cellspacing="0" cellpadding="0">
                    <tr class="middle_first">
                        <td class="middle_tree">编号</td>
                        <td class="middle_two">批次</td>
                        <td class="middle_two">材料</td>
                        <td class="middle_two">部件名称</td>
                        <td class="middle_four">尺寸</td>
                        <td class="middle_one">部件条码</td>
@@ -50,7 +50,7 @@
                        <td class="middle_tree">{{ item.num }}</td>
                        <td class="middle_two">
                            <div>
                                {{ item.planNo }}
                                {{ item.info18 }}
                            </div>
                        </td>
                        <td class="middle_two">
@@ -110,8 +110,10 @@
    });
    deltailList.value = splitArray(deltailListArr, 16);
    console.log(deltailList.value);
    DateToday.value = '2024-01-01';
    const currentDate = new Date();
    const formattedDate = currentDate.toISOString().split('T')[0]; // YYYY-MM-DD 格式
    DateToday.value = formattedDate; // 将当前日期赋值给 DateToday
    // DateToday.value = '2024-01-01';
    // DateToday.value = formatUtcToData(
    //   new Date().toString(),
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/index.vue
@@ -184,7 +184,21 @@
         <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>
                    <el-pagination
                v-model:currentPage="tableParams.page"
                v-model:page-size="tableParams.pageSize"
                :total="tableParams.total"
                :page-sizes="[10, 20, 50, 100, 200, 500]"
                small=""
                background=""
                @size-change="handleSizeChange"
                @current-change="handleCurrentChange"
                layout="total, sizes, prev, pager, next, jumper"
            />
                </div>
            </div>
        </el-card>
@@ -322,8 +336,7 @@
    );
    newTableData.value = res2.data.result.items ?? [];
    // tableParams.value.total = res.data.result?.total;
    tableParams.value.total = res2.data.result?.total;
    loading.value = false;
    // getEnumOrderTypeData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('OrderTypeEnum')).data.result ?? [];
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/shortageList/component/openAllprop.vue
@@ -51,6 +51,7 @@
    <el-table-column prop="packageCode" label="包装号" 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="info18" 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 />
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanOutput.cs
@@ -288,5 +288,8 @@
    /// 部件尺寸
    /// </summary>
    public string? Info16 { get; set; }
    /// <summary>
    /// 材料
    /// </summary>
    public string? Info18 { get; set; }
}
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs
@@ -459,6 +459,7 @@
                    //Info14 = item.Info14,
                    Info15 = item.Info15,
                    Info16 = item.Info16,
                    Info18 = item.Info18,
                    Length = item.Length,
                    Width = item.Width,
                    Thk = item.Thk
LuLiScreen/index.html
@@ -205,6 +205,7 @@
    <script src="./js/jquery-1.8.3.min.js"></script>
    <script src="./js/jquery.liMarquee.js"></script>
    <script>
        let isMarqueeInitialized = false; // 初始化标志
        $(document).on("ready", function () {
            function fetchAllData() {
@@ -304,11 +305,24 @@
                   </li>`;
                        });
                        $('#idList3').append(listItems1);
                        $('.dowebok2').liMarquee({
                            direction: 'up',
                            scrollamount: 20,
                            runshort: false
                        });
                        // 仅在标志为 false 时初始化
                        if (!isMarqueeInitialized) {
                            $('.dowebok2').liMarquee({
                                direction: 'up',
                                scrollamount: 20,
                                runshort: false
                            });
                            isMarqueeInitialized = true; // 初始化后将标志设置为 true
                        }
                        // $('.dowebok2').liMarquee('destroy'); // 销毁之前的实例
                        // $('.dowebok2').liMarquee({
                        //     direction: 'up',
                        //     scrollamount: 20,
                        //     runshort: false
                        // });
                    }
                });