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

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

This commit is contained in:
hongchao 2024-12-27 13:36:46 +08:00
parent 0a821b88b1
commit faf58c9786
3 changed files with 81 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/material/basic/unitType/index.vue
View File

@ -473,7 +473,7 @@ export default {
/** 导出按钮操作 */
handleExport() {
this.download(
"/material/base/dic/export",
"/material/bm_unit_type/export",
{
...this.queryParams,
dataCondition: this.ids,

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

@ -410,7 +410,7 @@
</el-dialog>
<!-- 领料单弹窗 -->
<el-dialog :visible.sync="open" width="800px" append-to-body>
<el-dialog :visible.sync="open" width="800px" :title="title" append-to-body>
<div style="height: 500px; overflow-y: scroll; padding: 0 20px">
<vue-easy-print tableShow ref="remarksPrintRef" class="print">
<div
@ -511,18 +511,16 @@
</el-table-column>-->
<el-table-column label="规格型号" align="center" prop="typeName" />
<el-table-column label="计量单位" align="center" prop="unitName" />
<el-table-column label="已领数量" align="center" prop="alNum" />
<el-table-column label="预领数量" align="center" prop="preNum" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column
label="出库方式"
align="center"
prop="manageTypeName"
prop="manageType"
>
<template slot-scope="scope">
<dict-tag
:options="dict.type.ma_type_manage_type"
:value="scope.row.manageType"
/>
<span v-if="scope.row.manageType == 0" style="color: blue;" @click="codeInfo(scope.row)">编码出库</span>
<span v-if="scope.row.manageType == 1">数量出库</span>
</template>
</el-table-column>
<!-- <el-table-column-->
@ -560,6 +558,52 @@
<el-button @click="open = false">关 闭</el-button>
</div>
</el-dialog>
<!-- 编码管理查看弹窗 -->
<el-dialog
:title="titleView"
:visible.sync="showView"
width="800px"
append-to-body
>
<div style="overflow-y: scroll">
<vue-easy-print tableShow ref="remarksPrintRefView" class="print">
<div
class="title"
style="text-align: center; font-weight: 600; font-size: 16px; margin-bottom:20px"
>
领料单编号明细
</div>
<el-table :data="getListViewInfo" width="600px" height="450">
<el-table-column align="center" label="序号" type="index" width="55" />
<el-table-column
label="类型名称"
align="center"
prop="materialName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="规格型号"
align="center"
prop="typeName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="设备编码"
align="center"
prop="maCode"
:show-overflow-tooltip="true"
/>
</el-table>
</vue-easy-print>
</div>
<div slot="footer" class="dialog-footer" style="text-align: center">
<el-button type="primary" @click="printView">打 印</el-button>
<el-button @click="showView = false">关 闭</el-button>
</div>
</el-dialog>
</div>
</template>
@ -646,6 +690,10 @@ export default {
// 领料任务详情数据
leaseApplyData: {},
sendTemp: [],
// 编码管理查看弹窗
showView: false,
titleView: "",
getListViewInfo: [],
};
},
created() {
@ -770,6 +818,7 @@ export default {
//打开领料单
async handleLld(row) {
this.title = "领料单";
this.open = true;
var ids = row.id;
const res = await getApplyInfo(ids);
@ -779,6 +828,17 @@ export default {
console.log(this.leaseApplyData);
},
codeInfo(row) {
this.showView = true;
this.titleView = "查看";
this.getListViewInfo = row.maCodeVoList;
},
//打印
printView() {
this.$refs.remarksPrintRefView.print();
},
//打印
print() {
this.$refs.remarksPrintRef.print();

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

@ -557,12 +557,12 @@
justify-content: right;
"
>
<div class="item" style="width: 50%; display: flex; align-items: center;">
<div class="item" style="width: 30%; align-items: center;position: relative;">
<div>
<span>检验单位：</span>
</div>
<div >
<canvas id="canvas" width="180" height="180" style="display: block;"></canvas>
<canvas id="canvas" width="165" height="165" style="position: absolute; top: 50%; left: 90%; transform: translate(-100%, -50%);"></canvas>
</div>
</div>
@ -579,7 +579,7 @@
</el-dialog>
<!-- 领料单弹窗 -->
<el-dialog :visible.sync="open" width="800px" append-to-body>
<el-dialog :visible.sync="open" width="800px" :title="title" append-to-body>
<div style="height: 500px; overflow-y: scroll; padding: 0 20px">
<vue-easy-print tableShow ref="remarksPrintRef" class="print">
<div
@ -680,7 +680,7 @@
</el-table-column>-->
<el-table-column label="规格型号" align="center" prop="typeName" />
<el-table-column label="计量单位" align="center" prop="unitName" />
<el-table-column label="已领数量" align="center" prop="alNum" />
<el-table-column label="预领数量" align="center" prop="preNum" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column
label="出库方式"
@ -812,7 +812,7 @@
<el-dialog
:title="titleView"
:visible.sync="showView"
width="1000px"
width="800px"
append-to-body
>
<div style="overflow-y: scroll">
@ -1186,7 +1186,7 @@ export default {
this.printTableData = res.data.leaseOutVoList;
setTimeout(() => {
this.chapter('机具检验专用章', this.checkDataInfo.leaseUnit)
this.chapter('检验专用章', '机具设备分公司')
}, 200);
this.openPrint = true;
this.title = "出库检验单";
@ -1203,13 +1203,12 @@ export default {
//打开领料单
async handleLld(row) {
this.title = "领料单";
this.open = true;
var ids = row.id;
const res = await getApplyInfo(ids);
console.log(res);
this.leaseApplyDetails = res.data.leaseApplyDetailsList;
this.leaseApplyData = res.data.leaseApplyInfo;
console.log(this.leaseApplyData);
},
//出库检验单打印
@ -1223,7 +1222,7 @@ export default {
},
//领料单打印
print() {
print() {
this.$refs.remarksPrintRef.print();
},
@ -1275,7 +1274,7 @@ export default {
},
printView() {
// this.$refs.remarksPrintRef.print();
this.$refs.remarksPrintRefView.print();
},
// 关闭弹窗并刷新页面
closeDialogAndRefresh() {
@ -1305,16 +1304,16 @@ export default {
this.create5star(context, width, height, 20, "#f00", 0);
// 绘制印章名称
context.font = "14px 宋体";
context.font = "18px 宋体";
context.textBaseline = "middle"; //设置文本的垂直对齐方式
context.textAlign = "center"; //设置文本的水平对对齐方式
context.lineWidth = 1;
context.strokeStyle = "#f00";
context.strokeStyle = "#ff2f2f";
context.strokeText(text, width, height + 50);
// 绘制印章单位
context.translate(width, height); // 平移到此位置,
context.font = "14px 宋体";
context.font = "16px 宋体";
let count = companyName.length; // 字数
let angle = (4 * Math.PI) / (3 * (count - 1)); // 字间角度
let chars = companyName.split("");
@ -1330,6 +1329,7 @@ export default {
context.save();
context.translate(65, 0); // 平移到此位置,此时字和x轴垂直，公司名称和最外圈的距离
context.rotate(Math.PI / 2); // 旋转90度,让字平行于x轴
context.strokeStyle = "#ff5050"; // 设置印章单位字体颜色为较浅的红色
context.strokeText(c, 0, 0); // 此点为字的中心点
context.restore();
}