bonus
/
bonus-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

领料申请，领料出库bug修复

This commit is contained in:
hongchao 2025-02-10 16:46:31 +08:00
parent 54c4bad8cb
commit c949f649c6
4 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/views/material/lease/apply/component/homeApply.vue
View File

@ -213,19 +213,23 @@
领料单 领料单
</div> </div>
<div class="info" style="margin-top: 10px; display: flex; flex-wrap: wrap" > <div class="info" style="margin-top: 10px; display: flex; flex-wrap: wrap" >
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;"> <div class="item" style="width: 60%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
<span>领料单位：</span> <span>领料单位：</span>
{{ leaseApplyData.leaseUnit }} {{ leaseApplyData.leaseUnit }}
</div> </div>
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;"> <div class="item" style="width: 40%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
<span>工程名称：</span> <span>工程名称：</span>
{{ leaseApplyData.leaseProject }} {{ leaseApplyData.leaseProject }}
</div> </div>
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;"> <div class="item" style="width: 40%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
<span>发料单位：</span>
{{ leaseApplyData.sendUnit }}
</div>
<div class="item" style="width: 30%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
<span>时间：</span> <span>时间：</span>
<span v-if="leaseApplyData.createTime">{{ leaseApplyData.createTime.split(" ")[0] }}</span> <span v-if="leaseApplyData.createTime">{{ leaseApplyData.createTime.split(" ")[0] }}</span>
</div> </div>
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;"> <div class="item" style="width: 30%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
<span>编号：</span> <span>编号：</span>
{{ leaseApplyData.code }} {{ leaseApplyData.code }}
</div> </div>

12
src/views/material/lease/outBound/index.vue
View File

@ -600,19 +600,23 @@
领料单 领料单
</div> </div>
<div class="info" style="margin-top: 10px; display: flex; flex-wrap: wrap"> <div class="info" style="margin-top: 10px; display: flex; flex-wrap: wrap">
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;"> <div class="item" style="width: 60%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
<span>领料单位：</span> <span>领料单位：</span>
{{ leaseApplyData.leaseUnit }} {{ leaseApplyData.leaseUnit }}
</div> </div>
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;"> <div class="item" style="width: 40%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
<span>工程名称：</span> <span>工程名称：</span>
{{ leaseApplyData.leaseProject }} {{ leaseApplyData.leaseProject }}
</div> </div>
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;"> <div class="item" style="width: 40%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
<span>发料单位：</span>
{{ leaseApplyData.sendUnit }}
</div>
<div class="item" style="width: 30%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
<span>时间：</span> <span>时间：</span>
<span v-if="leaseApplyData.createTime">{{ leaseApplyData.createTime.split(" ")[0] }}</span> <span v-if="leaseApplyData.createTime">{{ leaseApplyData.createTime.split(" ")[0] }}</span>
</div> </div>
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;"> <div class="item" style="width: 30%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
<span>编号：</span> <span>编号：</span>
{{ leaseApplyData.code }} {{ leaseApplyData.code }}
</div> </div>

4
src/views/material/purchase/goodsBind/component/bindTools.vue
View File

@ -794,12 +794,14 @@ export default {
this.codeTableList = []; this.codeTableList = [];
// 1.3 循环生成编码 // 1.3 循环生成编码
for (let i = 0; i < passCodeNUm; i++) { for (let i = 0; i < passCodeNUm; i++) {
// 计算当前的后缀值，保留前导零
const currentSuffix = (parseInt(codeSuffixStart) + i).toString().padStart(codeSuffixStart.length, '0');
const codeItem = { const codeItem = {
typeName, typeName,
maTypeName, maTypeName,
outFacCode: "", outFacCode: "",
// productDate: "", // productDate: "",
maCode: `${codePrefix}${parseInt(codeSuffixStart) + i}`, maCode: `${codePrefix}${currentSuffix}`,
}; };
this.codeTableList.push(codeItem); this.codeTableList.push(codeItem);
} }

16
src/views/material/repair/repairManage/component/home.vue
View File

@ -85,23 +85,23 @@
机具设备维修任务单 机具设备维修任务单
</div> </div>
<div class="info" style="margin-top: 10px; display: flex; flex-wrap: wrap"> <div class="info" style="margin-top: 10px; display: flex; flex-wrap: wrap">
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;"> <div class="item" style="width: 60%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
<span>日期：</span> <span>日期：</span>
{{ repairTicketlLevelOne.createTime }} {{ repairTicketlLevelOne.createTime }}
</div> </div>
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;"> <div class="item" style="width: 40%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
<span>单号：</span> <span>单号：</span>
{{ repairTicketlLevelOne.repairCode }} {{ repairTicketlLevelOne.repairCode }}
</div> </div>
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;"> <div class="item" style="width: 60%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
<span>承修单位：</span> <span>承修单位：</span>
{{ repairTicketlLevelOne.backUnit }} {{ repairTicketlLevelOne.backUnit }}
</div> </div>
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;"> <!-- <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
<span>制单：</span> <span>制单：</span>
{{ repairTicketlLevelOne.repairer }} {{ repairTicketlLevelOne.repairer }}
</div> </div> -->
<div class="item" style="width: 100%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;"> <div class="item" style="width: 40%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
<span>项目名称：</span> <span>项目名称：</span>
{{ repairTicketlLevelOne.backPro }} {{ repairTicketlLevelOne.backPro }}
</div> </div>
@ -109,9 +109,9 @@
<span>委托单位：</span> <span>委托单位：</span>
{{ repairTicketlLevelOne.backUnit }} {{ repairTicketlLevelOne.backUnit }}
</div> </div>
<div class="item" style="width: 50%; flex-shrink: 0; margin-bottom: 5px; font-size: 14px;"> <!-- <div class="item" style="width: 50%; flex-shrink: 0; margin-bottom: 5px; font-size: 14px;">
<span>验收人：</span> <span>验收人：</span>
</div> </div> -->
</div> </div>
<el-table :data="repairTicketDevice" class="table" style="margin-top: 20px; width: 1000px; " border> <el-table :data="repairTicketDevice" class="table" style="margin-top: 20px; width: 1000px; " border>
<!-- <el-table-column type="selection" width="55" align="center" />--> <!-- <el-table-column type="selection" width="55" align="center" />-->