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

Merge branch 'material-ui' of http://192.168.30.2:3000/bonus/bonus-ui into material-ui

This commit is contained in:
zzyuan 2024-11-15 18:33:42 +08:00
parent 879f1f4661 f9425a1188
commit b9603f1ccc
7 changed files with 1741 additions and 1128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/api/purchase/goodsBind.js
View File

@ -22,6 +22,15 @@ export function getNewBuyBindListDetailsApi(query) {
})
}
//二级页面 查看
export function getMaCodeInfo(query) {
return request({
url: '/material/purchase_macode_info/list',
method: 'get',
params: query,
})
}
//任务 详情
export function bindAllData(data) {
return request({
@ -40,6 +49,7 @@ export function getListDetailById(query) {
})
}
// 导出
export function exportNewBuy(data) {
return request({

9
src/api/repair/testExamine.js
View File

@ -17,7 +17,14 @@ export function getAuditInfo(query) {
})
}
//修试审核二级-通过，驳回
export function auditPass(data) {
return request({
url: '/material/repair_audit_details',
method: 'put',
data: data,
})
}

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

@ -118,7 +118,7 @@
label="申请数量"
align="center"
prop="preCountNum"
width="110px"
width="80px"
:show-overflow-tooltip="true"
>
</el-table-column>
@ -127,7 +127,7 @@
label="已出库数量"
align="center"
prop="alNum"
width="110px"
width="90px"
:show-overflow-tooltip="true"
>
</el-table-column>
@ -175,7 +175,7 @@
:show-overflow-tooltip="true"
/>
<el-table-column label="操作" align="center" width="230">
<el-table-column label="操作" align="center" width="270">
<template slot-scope="scope">
<el-button
size="mini"
@ -189,7 +189,6 @@
style="margin-bottom: 10px"
type="primary"
@click="handleOut(scope.row)"
v-if="scope.row.taskStatus != 5"
v-hasPermi="['purchase:info:edit']"
>出库</el-button
>
@ -197,15 +196,15 @@
<el-button
size="mini"
type="warning"
@click="handlePrint(scope.row)"
v-if="scope.row.taskStatus == 5"
@click="handleLld(scope.row)"
v-if="scope.row.taskStatus == 4"
>领料单</el-button
>
<el-button
size="mini"
type="warning"
@click="handlePrint(scope.row)"
v-if="scope.row.taskStatus == 5"
v-if="scope.row.taskStatus == 4"
>出库检验单</el-button
>
</template>
@ -310,13 +309,13 @@
</template>
</el-table-column>
</el-table>
<!-- <pagination
<pagination
v-show="dialogTotal > 0"
:total="dialogTotal"
:page.sync="dialogQuery.pageNum"
:limit.sync="dialogQuery.pageSize"
:page.sync="queryOutInfo.pageNum"
:limit.sync="queryOutInfo.pageSize"
@pagination="getDialogList"
/> -->
/>
</el-dialog>
<!-- 查看弹窗 -->
@ -375,7 +374,7 @@
<el-table-column
label="待出库数量"
align="center"
prop="roleName"
prop="outNum"
:show-overflow-tooltip="true"
/>
<el-table-column
@ -384,37 +383,14 @@
prop="alNum"
:show-overflow-tooltip="true"
/>
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
<el-button
size="mini"
@click="codeOut(scope.row)"
v-if="scope.row.manageType == 0"
>
编码出库
</el-button>
<el-button
size="mini"
type="primary"
v-if="scope.row.manageType == 1"
@click="numOut(scope.row)"
>
数量出库
</el-button>
</template>
</el-table-column>
</el-table>
<!-- <pagination
<pagination
v-show="ViewTotal > 0"
:total="ViewTotal"
:page.sync="queryOutView.pageNum"
:limit.sync="queryOutView.pageSize"
@pagination="getListView"
/> -->
/>
</el-dialog>
<!-- 编码出库 -->
@ -489,8 +465,7 @@
:show-overflow-tooltip="true"
/>
</el-table>
</el-dialog>
<!-- <pagination
<pagination
v-show="outTotal > 0"
:total="outTotal"
:page.sync="outQuery.pageNum"
@ -640,15 +615,168 @@
<el-button @click="openPrint = false">关 闭</el-button>
</div>
</el-dialog>
<!-- 领料单弹窗 -->
<el-dialog :visible.sync="open" width="800px" append-to-body>
<div style="height: 500px; overflow-y: scroll; padding: 0 20px">
<vue-easy-print tableShow ref="remarksPrintRef" class="print">
<div
class="title"
style="text-align: center; font-weight: 600; font-size: 16px"
>
领料单
</div>
<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;
"
>
<span>领料单位：</span>
{{ leaseApplyData.leaseUnit }}
</div>
<div
class="item"
style="
width: 50%;
flex-shrink: 0;
margin-bottom: 5px;
font-size: 14px;
"
>
<span>工程名称：</span>
{{ leaseApplyData.leaseProject }}
</div>
<div
class="item"
style="
width: 50%;
flex-shrink: 0;
margin-bottom: 5px;
font-size: 14px;
"
>
<span>时间：</span>
{{ leaseApplyData.createTime }}
</div>
<div
class="item"
style="
width: 50%;
flex-shrink: 0;
margin-bottom: 5px;
font-size: 14px;
"
>
<span>编号：</span>
{{ leaseApplyData.code }}
</div>
</div>
<el-table
:data="leaseApplyDetails"
class="table"
border
style="margin-top: 20px; padding: 1px"
>
<el-table-column label="序号" align="center" type="index" />
<el-table-column label="类型名称" align="center" prop="typeName" />
<!-- <el-table-column type="expand">
<template slot-scope="scope">
<div class="nested-table-container">
<el-table :data="scope.row.maTypeDetails" style="width: 100%">
&lt;!&ndash; 子表格的列 &ndash;&gt;
<el-table-column label="序号" align="center" type="index"/>
<el-table-column label="类型名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
<el-table-column
label="规格型号"
align="center"
prop="typeName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="单位"
align="center"
prop="unitName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="预领数量"
align="center"
prop="preNum"
:show-overflow-tooltip="true"
/>
</el-table>
</div>
</template>
</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="preNum" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column
label="出库方式"
align="center"
prop="manageTypeName"
>
<template slot-scope="scope">
<dict-tag
:options="dict.type.ma_type_manage_type"
:value="scope.row.manageType"
/>
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- label="出库方式"-->
<!-- align="center"-->
<!-- prop="manageTypeName"-->
<!-- />-->
</el-table>
<div
class="fillIn"
style="
margin-top: 30px;
display: flex;
justify-content: space-between;
"
>
<div class="item" style="width: 25%">
<span>审核：</span>
</div>
<div class="item" style="width: 25%">
<span>领料：</span>
</div>
<div class="item" style="width: 25%">
<span>仓库：</span>
</div>
<div class="item" style="width: 25%">
<span>操作人：</span>
</div>
</div>
</vue-easy-print>
</div>
<div slot="footer" class="dialog-footer" style="text-align: center">
<el-button type="primary" @click="print">打 印</el-button>
<el-button @click="open = false">关 闭</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { getListLeaseApply } from "@/api/lease/apply";
import { getListLeaseApply, getApplyInfo } from "@/api/lease/apply";
import { outInfoList, getDetailsByTypeId, submitOut } from "@/api/lease/out";
import vueEasyPrint from "vue-easy-print";
export default {
dicts: ["lease_task_status"],
// components: { vueEasyPrint },
components: { vueEasyPrint },
data() {
return {
// 遮罩层
@ -660,6 +788,7 @@ export default {
showOutInfo: false,
//编码出库的显示
openCode: false,
open: false,
// 选中数组
ids: [],
// 非单个禁用
@ -672,6 +801,7 @@ export default {
total: 0,
ViewTotal: 0,
outTotal: 0,
dialogTotal: 0,
// 弹出层标题
title: "",
typeList: [],
@ -716,6 +846,10 @@ export default {
outNum: 0,
outObj: {},
parentIdTemp: undefined,
//领料单
leaseApplyDetails: [],
// 领料任务详情数据
leaseApplyData: {},
};
},
created() {
@ -732,6 +866,7 @@ export default {
manageType: 0,
maId: item.maId,
parentId: this.parentIdTemp,
outNum: 1,
});
});
this.single = selection.length != 1;
@ -773,10 +908,19 @@ export default {
this.getDialogList();
},
getListView() {
outInfoList(this.queryOutView.id).then((response) => {
this.getListOutInfo = response.data.leaseApplyDetailsList;
// this.dialogTotal = response.
// this.loading = false;
});
},
/** 出库查询列表 */
getDialogList() {
outInfoList(this.queryOutInfo.id).then((response) => {
this.getListOutInfo = response.data.leaseApplyDetailsList;
// this.dialogTotal = response.
// this.loading = false;
});
},
@ -786,6 +930,11 @@ export default {
handleView(row) {
this.title = "查看";
this.showOutView = true;
this.queryOutView.id = row.id;
outInfoList(row.id).then((response) => {
this.getListOutInfo = response.data.leaseApplyDetailsList;
// this.loading = false;
});
},
/** 出库按钮操作 */
handleOut(row) {
@ -803,10 +952,10 @@ export default {
//编码出库
codeOut(row) {
// this.title = '编码出库'
this.title = "编码出库";
this.openCode = true;
// this.resetForm("codeOutForm");
// this.resetForm("outQuery");
this.resetForm("outQuery");
this.parentIdTemp = row.parentId;
this.outNum = row.outNum;
this.outQuery.typeId = row.typeId;
@ -872,6 +1021,18 @@ export default {
this.openPrint = true;
this.title = "机具设备到货验收单";
},
//打开领料单
async handleLld(row) {
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);
},
//打印
print() {
this.$refs.remarksPrintRef.print();

1091
src/views/material/purchase/goodsAccept/detail.vue
View File

File diff suppressed because it is too large Load Diff

4
src/views/material/purchase/goodsArrived/component/home.vue
View File

@ -787,8 +787,8 @@ export default {
message: "操作成功",
type: "success",
});
this.noticeOpen = false;
this.getTaskInfo();
this.showPeople = false;
this.getList();
}
});
} else {

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

File diff suppressed because it is too large Load Diff

122
src/views/material/repair/testExamine/component/queryToolsApply.vue
View File

@ -4,7 +4,6 @@
:model="maForm"
ref="maForm"
size="small"
:rules="rules"
:inline="true"
label-width="120px"
>
@ -48,17 +47,17 @@
<el-button
type="success"
plain
icon="el-icon-download"
icon="el-icon-check"
size="mini"
@click="handlePassAll"
>合格</el-button
>通过</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
type="danger"
plain
icon="el-icon-download"
icon="el-icon-close"
size="mini"
@click="handleFailAll"
>驳回</el-button
@ -71,18 +70,23 @@
row-key="id"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column
type="selection"
width="55"
align="center"
:selectable="selectable"
/>
<el-table-column label="序号" align="center" type="index" />
<el-table-column
label="类型名称"
align="center"
prop="maTypeName"
prop="specificationType"
:show-overflow-tooltip="true"
/>
<el-table-column
label="规格型号"
align="center"
prop="typeName"
prop="machineTypeName"
:show-overflow-tooltip="true"
/>
<el-table-column
@ -95,41 +99,73 @@
<el-table-column
label="退料数量"
align="center"
prop="storageNum"
prop="scrapNum"
:show-overflow-tooltip="true"
>
</el-table-column>
<el-table-column
label="已修数量"
align="center"
prop="preNum"
prop="repairedNum"
:show-overflow-tooltip="true"
/>
<el-table-column
label="待修数量"
align="center"
prop="alNum"
prop="waitNum"
:show-overflow-tooltip="true"
/>
>
<template slot-scope="scope">
<div>
{{ scope.row.repairNum - scope.row.repairedNum }}
</div>
</template>
</el-table-column>
<el-table-column
label="管理模式"
align="center"
prop="alNum"
:show-overflow-tooltip="true"
/>
<el-table-column
label="审核状态"
align="center"
prop="status"
:show-overflow-tooltip="true"
>
<template slot-scope="scope">
<div v-if="scope.row.status == '0'" style="color: #e6a23c">
{{ "未审核" }}
</div>
<div v-if="scope.row.status == '1'" style="color: #67c23a">
{{ "已审核" }}
</div>
<div v-if="scope.row.status == '2'" style="color: #f56c6c">
{{ "驳回" }}
</div>
<!-- <div v-else style="color: red;"></div> -->
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="300">
<template slot-scope="scope">
<el-button
size="mini"
style="margin-bottom: 10px"
type="primary"
v-if="scope.row.status == '0'"
@click="handlePass(scope.row)"
>通过
</el-button>
<el-button size="mini" type="danger" @click="handleFail(scope.row)"
<el-button
size="mini"
type="danger"
@click="handleFail(scope.row)"
v-if="scope.row.status == '0'"
>驳回
</el-button>
<div v-if="scope.row.status != '0'">-</div>
</template>
</el-table-column>
</el-table>
@ -144,7 +180,7 @@
</template>
<script>
import { getAuditInfo } from "@/api/repair/testExamine";
import { getAuditInfo, auditPass } from "@/api/repair/testExamine";
import { getToken } from "@/utils/auth";
export default {
name: "QueryTools",
@ -191,6 +227,8 @@ export default {
projectList: [],
// 表格数据
equipmentList: [],
passTemp: [],
faliTemp: [],
// 选中数组
ids: [],
// 非单个禁用
@ -216,9 +254,25 @@ export default {
this.getTaskInfo();
},
methods: {
//是否可用勾选框
selectable(row) {
if (row.status == "0") {
return true;
} else {
return false;
}
},
// 多选框选中数据
handleSelectionChange(selection) {
this.passTemp = [];
this.failTemp = [];
this.ids = selection.map((item) => item.id);
selection.forEach((item) => {
this.passTemp.push({ id: item.id, status: "1" });
});
selection.forEach((item) => {
this.failTemp.push({ id: item.id, status: "2" });
});
this.single = selection.length != 1;
this.multiple = !selection.length;
},
@ -232,23 +286,29 @@ export default {
this.loading = false;
});
},
//单个通过
handlePass(row) {
const param = [];
param.push({ id: row.id, status: "1" });
this.$modal
.confirm("是否确认合格所选择的数据项？")
.confirm("是否确认通过所选择的数据项？")
.then(function () {
// return applySend(row.id);
return auditPass(param);
})
.then(() => {
this.getTaskInfo();
this.$modal.msgSuccess("合格成功");
this.$modal.msgSuccess("通过成功");
})
.catch(() => {});
},
//单个驳回
handleFail(row) {
const param = [];
param.push({ id: row.id, status: "2" });
this.$modal
.confirm("是否确认驳回所选择的数据项？")
.then(function () {
// return applySend(row.id);
return auditPass(param);
})
.then(() => {
this.getTaskInfo();
@ -256,6 +316,7 @@ export default {
})
.catch(() => {});
},
//多个通过
handlePassAll() {
if (this.ids.length == 0) {
this.$alert("请至少勾选一条审核数据", "提示", {
@ -264,14 +325,15 @@ export default {
});
return;
} else {
// applySendAll(this.sendTemp).then((response) => {
// if (response.code == 200) {
// this.$modal.msgSuccess("合格成功");
// }
// this.getTaskInfo();
// });
auditPass(this.passTemp).then((response) => {
if (response.code == 200) {
this.$modal.msgSuccess("通过成功");
}
this.getTaskInfo();
});
}
},
//多个驳回
handleFailAll() {
if (this.ids.length == 0) {
this.$alert("请至少勾选一条审核数据", "提示", {
@ -280,12 +342,12 @@ export default {
});
return;
} else {
// applySendAll(this.sendTemp).then((response) => {
// if (response.code == 200) {
// this.$modal.msgSuccess("驳回成功");
// }
// this.getTaskInfo();
// });
auditPass(this.failTemp).then((response) => {
if (response.code == 200) {
this.$modal.msgSuccess("驳回成功");
}
this.getTaskInfo();
});
}
},
},