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

新购参数修改

This commit is contained in:
zzyuan 2024-11-16 15:48:33 +08:00
parent 2e009ddc19
commit 145d6feaf6
7 changed files with 42 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -305,27 +305,18 @@
</el-dialog>
<!-- 验收弹窗 -->
<el-dialog :visible.sync="confirmShow" width="500px" height="300px">
<div style="width: 100%; height: 80%; display: flex">
<div>验收结论</div>
<el-dialog title="验收" :visible.sync="confirmShow" width="600px" height="300px">
<div style="width: 100%; height: 80%; display: flex;margin-bottom: 10px;">
<div style="width:12%;">验收结论：</div>
<el-input
type="textarea"
:rows="2"
:rows="3" style="width:80%;"
placeholder="请输入结论"
v-model="checkResult"
maxlength="100"
>
maxlength="100">
</el-input>
</div>
<div
style="
width: 100%;
height: 20%;
display: flex;
justify-content: flex-end;
align-items: center;
"
>
<div style="width: 100%;height: 20%;display: flex;justify-content: flex-end;align-items: center;">
<el-button type="primary" @click="confirmCheck">确认</el-button>
<el-button size="mini" @click="confirmShow = false">取消</el-button>
</div>
@ -395,6 +386,7 @@ export default {
confirmShow: false,
taskStatus: "", //3合格、1不合格
checkResult: "",
verifyPass: true, //true合格、false不合格
//图片查看弹窗
dialogImageUrl: "",
dialogVisible: false,
@ -456,7 +448,7 @@ export default {
this.loading = true;
this.queryParams.id = this.Id;
this.queryParams.taskId = this.taskId;
this.queryParams.taskStatus = 2;
// this.queryParams.taskStatus = 2;
this.queryParams.statusList = [2, 12];
getPurchaseDetailsList(this.queryParams).then((response) => {
this.tableList = response.data.purchaseCheckDetailsList;
@ -488,6 +480,7 @@ export default {
pass(row) {
this.taskStatus = "3";
this.checkResult = "合格";
this.verifyPass = true;
let obj = {
taskId: row.taskId,
typeId: row.typeId,
@ -503,6 +496,7 @@ export default {
reject(row) {
this.taskStatus = "1";
this.checkResult = "不合格";
this.verifyPass = false;
let obj = {
taskId: row.taskId,
typeId: row.typeId,
@ -518,6 +512,7 @@ export default {
batchPass() {
this.taskStatus = "3";
this.checkResult = "合格";
this.verifyPass = true;
this.checkList = [];
this.checkList = this.ids.map((item) => {
let obj = {
@ -535,6 +530,7 @@ export default {
batchReject() {
this.taskStatus = "1";
this.checkResult = "不合格";
this.verifyPass = false;
this.checkList = [];
this.checkList = this.ids.map((item) => {
let obj = {
@ -553,8 +549,12 @@ export default {
this.checkList.forEach((item) => {
item.checkResult = this.checkResult;
});
console.log(this.checkList);
acceptInnerVerifyer(this.checkList).then((response) => {
let param = {
purchaseCheckDetailsList:this.checkList,
verifyPass:this.verifyPass
}
console.log(param);
acceptInnerVerifyer(param).then((response) => {
if (response.code == 200) {
this.$modal.msgSuccess("验收成功");
this.confirmShow = false;

2
src/views/material/purchase/goodsAccept/index.vue
View File

@ -340,7 +340,7 @@
this.queryParams.startTime=undefined
this.queryParams.endTime=undefined
}
this.queryParams.taskStatus="2"
// this.queryParams.taskStatus="2"
this.queryParams.statusList=[2,12]
getPurchaseList(this.queryParams).then(response => {
this.tableList = response.rows;

2
src/views/material/purchase/goodsArrived/component/addTools.vue
View File

@ -577,7 +577,7 @@ export default {
//获取任务详情--- 编辑回显数据
getTaskInfo() {
// this.loading = true;
getPurchaseCheckInfo({taskId:this.taskId,id:this.id,taskStatus:1,statusList:[1]}).then((response) => {
getPurchaseCheckInfo({taskId:this.taskId,id:this.id,statusList:[1]}).then((response) => {
this.maForm = response.data.purchaseCheckInfo
this.maForm.id = response.data.purchaseCheckInfo.id
this.maForm.taskId = response.data.purchaseCheckInfo.taskId

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

@ -474,7 +474,7 @@ export default {
taskId: "",
keyWord: "",
productDate: "",
taskStatus: 3,
// taskStatus: 3,
},
taskId: "",
// 是否显示弹出层

2
src/views/material/purchase/goodsBind/component/home.vue
View File

@ -216,7 +216,7 @@ export default {
endTime: '',
keyWord: '',
startTime: '',
taskStatus: 3,
// taskStatus: 3,
},
}
},

2
src/views/material/purchase/goodsEntry/detail.vue
View File

@ -269,7 +269,7 @@ export default {
this.loading = true;
this.queryParams.id=this.Id
this.queryParams.taskId=this.taskId
this.queryParams.statusList=[4,14]
this.queryParams.statusList=[4,14,19]
getPurchaseDetailsList(this.queryParams).then(response => {
this.tableList = response.data.purchaseCheckDetailsList;
this.tableList.forEach((item) => {

111
src/views/material/purchase/goodsEntry/index.vue
View File

@ -180,20 +180,9 @@
prop="taskStatus"
:show-overflow-tooltip="true"
>
<template slot-scope="scope">
<span v-if="scope.row.taskStatus == 0">待提交</span>
<span v-if="scope.row.taskStatus == 1">待通知</span>
<span v-if="scope.row.taskStatus == 2">待验收</span>
<span v-if="scope.row.taskStatus == 3">待绑定</span>
<span v-if="scope.row.taskStatus == 4">待入库</span>
<span v-if="scope.row.taskStatus == 5">已完成</span>
<span v-if="scope.row.taskStatus == 6">驳回待验收</span>
<span v-if="scope.row.taskStatus == 7">驳回待绑定</span>
<span v-if="scope.row.taskStatus == 8">驳回待入库</span>
<span v-if="scope.row.taskStatus == 9">入库进行中</span>
<span v-if="scope.row.taskStatus == 10">未完成</span>
<!-- <span v-else>/</span> -->
</template>
<template slot-scope="scope">
<dict-tag :options="dict.type.purchase_task_status" :value="scope.row.taskStatus"/>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" width="250">
@ -236,96 +225,33 @@
>
<div style="height: 500px; overflow-y: scroll">
<vue-easy-print tableShow ref="remarksPrintRef" class="print">
<div
class="title"
style="
text-align: center;
font-weight: 600;
font-size: 16px;
"
>
<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: 100%;
flex-shrink: 0;
margin-bottom: 5px;
font-size: 14px;
"
>
<div class="info" style="margin-top: 10px; display: flex; flex-wrap: wrap" >
<div class="item" style="width: 100%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
<span>单据编号：{{ printData.code }}</span>
</div>
<div
class="item"
style="
width: 50%;
flex-shrink: 0;
margin-bottom: 5px;
font-size: 14px;
"
>
<span
>生产厂家（供应商）：{{
printData.supplierName
}}</span
>
<div class="item" style=" width: 50%; flex-shrink: 0; margin-bottom: 5px; font-size: 14px;">
<span>生产厂家（供应商）：{{printData.supplierName}}</span>
</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>到货日期：{{ printData.arrivalDate }}</span>
</div>
</div>
<el-table
:data="printTableData"
class="table"
style="
margin-top: 20px;
width: 1000px;
padding-bottom: 1px;
"
border
>
<el-table :data="printTableData" class="table" border
style="margin-top: 20px;width: 1000px;padding-bottom: 1px;">
<!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column
label="序号"
align="center"
type="index"
row="2"
<el-table-column label="序号" align="center" type="index" row="2"
/>
<el-table-column
label="物资名称"
align="center"
prop="maTypeName"
<el-table-column label="物资名称" align="center" prop="maTypeName"
/>
<el-table-column
label="规格型号"
align="center"
prop="typeName"
<el-table-column label="规格型号" align="center" prop="typeName"
/>
<el-table-column
label="单位"
align="center"
prop="unitName"
<el-table-column label="单位" align="center" prop="unitName"
/>
<el-table-column label="配送信息" align="center">
<el-table-column
label="采购数量"
align="center"
prop="purchaseNum"
<el-table-column label="采购数量" align="center" prop="purchaseNum"
/>
<el-table-column
label="验收结论"
@ -411,6 +337,7 @@ import { downloadFile } from '@/utils/download'
import { getToken } from '@/utils/auth'
export default {
name: 'GoodsAcceptList',
dicts: ['purchase_task_status'],
data() {
return {
// 遮罩层
@ -442,7 +369,7 @@ export default {
pageNum: 1,
pageSize: 10,
keyWord: undefined,
taskStatus: 4,
// taskStatus: 4,
},
openPrint: false,
printData: {},
@ -463,7 +390,7 @@ export default {
this.queryParams.startTime = undefined
this.queryParams.endTime = undefined
}
this.queryParams.statusList=[4,14]
this.queryParams.statusList=[4,14,19]
// this.queryParams.modelName="新购验收"
getPurchaseList(this.queryParams).then((response) => {
this.tableList = response.rows