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

新购模块对接

This commit is contained in:
zzyuan 2024-12-23 18:15:42 +08:00
parent c398a0de6b
commit b74bef31ae
5 changed files with 75 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,7 +112,7 @@
<el-table-column
type="selection"
width="55"
align="center"
align="center" :selectable="selectable"
:reserve-selection="true"
v-if="!isView"
/>
@ -203,10 +203,10 @@
/>
<el-table-column label="操作" align="center" width="180" v-if="!isView">
<template slot-scope="scope">
<el-button size="mini" type="success" @click="pass(scope.row)">
<el-button size="mini" type="success" @click="pass(scope.row)" v-if="scope.row.status==2">
合格
</el-button>
<el-button size="mini" type="danger" @click="reject(scope.row)">
<el-button size="mini" type="danger" @click="reject(scope.row)" v-if="scope.row.status==2">
不合格
</el-button>
</template>
@ -404,6 +404,15 @@ export default {
this.getList();
},
methods: {
//是否可用勾选框
selectable(row) {
console.log(row)
if (row.status == 2) {
return true
} else {
return false
}
},
// 返回列表页
jumpList() {
const obj = { path: "/purchase/goodsAccept" };

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

@ -20,22 +20,22 @@
maxlength="20"
/>
</el-form-item>
<!-- <el-form-item prop="status">
<el-form-item prop="isFinish">
<el-select
clearable
filterable
style="width: 240px"
placeholder="请选择设备状态"
v-model="queryParams.status"
placeholder="状态筛选"
v-model="queryParams.isFinish"
>
<el-option
:key="dict.value"
:label="dict.label"
:value="dict.value"
v-for="dict in dict.type.purchase_task_status"
:key="dict.id"
:label="dict.name"
:value="dict.id"
v-for="dict in taskStatusList"
/>
</el-select>
</el-form-item> -->
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
@ -98,7 +98,7 @@
</el-button>
<el-button
size="mini"
type="primary"
type="primary" v-if="scope.row.taskStatusName == '未完成'"
@click="handleUpdate(scope.row)"
>
验收
@ -284,9 +284,7 @@
<el-button @click="openPrint = false">关 闭</el-button>
</div>
</el-dialog>
</div>
</template>
@ -310,7 +308,7 @@
showSearch: true,
showHouse: false,
dateRange:[],
taskStatusList:[{id:'1',name:'待验收'},{id:'2',name:'验收合格'},{id:'3',name:'验收未通过'}],
taskStatusList:[{id:'0',name:'未完成'},{id:'1',name:'已完成'}],
ids:[],
// 总条数
total: 0,
@ -325,7 +323,7 @@
pageNum: 1,
pageSize: 10,
keyWord:undefined,
status:undefined,
isFinish:undefined,
},
openPrint: false,
printData: {},

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

@ -48,6 +48,22 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item prop="isFinish">
<el-select
clearable
filterable
style="width: 240px"
placeholder="状态筛选"
v-model="queryParams.isFinish"
>
<el-option
:key="dict.id"
:label="dict.name"
:value="dict.id"
v-for="dict in taskStatusList"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button
@ -200,13 +216,14 @@
style="margin-bottom: 10px"
type="normal"
@click="handleView(scope.row)"
v-if="scope.row.taskStatus != 24"
>查看</el-button
>
<el-button
size="mini"
style="margin-bottom: 10px"
type="primary"
v-if="scope.row.taskStatusName == '未完成'"
@click="handleUpdate(scope.row)"
v-hasPermi="['purchase:info:edit']"
>编辑</el-button
@ -216,7 +233,8 @@
size="mini"
style="margin-bottom: 10px"
type="success"
@click="handleNotice(scope.row)"
v-if="scope.row.taskStatusName == '未完成'"
@click="handleNotice(scope.row)"
v-hasPermi="['purchase:person:notice']"
>通知</el-button
>
@ -601,6 +619,7 @@ export default {
title: "",
// 日期范围
dateRange: [],
taskStatusList:[{id:'0',name:'未完成'},{id:'1',name:'已完成'}],
// 查询参数
queryParams: {
pageNum: 1,
@ -608,6 +627,7 @@ export default {
time: null, //申请时间
name: undefined,
status: undefined,
isFinish: undefined,
typeId: "",
keyWord: "",
},
@ -647,6 +667,7 @@ export default {
keyWord: this.queryParams.keyWord,
startTime: this.queryParams.time && this.queryParams.time[0],
endTime: this.queryParams.time && this.queryParams.time[1],
isFinish: this.queryParams.isFinish,
typeId: this.queryParams.typeId,
pageSize: this.queryParams.pageSize,
pageNum: this.queryParams.pageNum,

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

@ -49,6 +49,22 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item prop="isFinish">
<el-select
clearable
filterable
style="width: 240px"
placeholder="状态筛选"
v-model="queryParams.isFinish"
>
<el-option
:key="dict.id"
:label="dict.name"
:value="dict.id"
v-for="dict in taskStatusList"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button
@ -199,11 +215,12 @@ export default {
bindList: [], // 列表数据源
queryTime: [], // 日期数据源
selectList: [], // 列表选中数据
taskStatusList:[{id:'0',name:'未完成'},{id:'1',name:'已完成'}],
// 列表查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
status: '',
isFinish: '',
endTime: '',
keyWord: '',
startTime: '',

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

@ -28,17 +28,19 @@
maxlength="20"
/>
</el-form-item>
<el-form-item prop="taskStatus">
<el-form-item prop="isFinish">
<el-select
v-model="queryParams.taskStatus"
placeholder="请选择任务状态"
clearable
filterable
style="width: 240px"
placeholder="状态筛选"
v-model="queryParams.isFinish"
>
<el-option
v-for="item in taskStatusList"
:key="item.id"
:label="item.name"
:value="item.id"
:key="dict.id"
:label="dict.name"
:value="dict.id"
v-for="dict in taskStatusList"
/>
</el-select>
</el-form-item>
@ -350,10 +352,7 @@ export default {
showSearch: true,
showHouse: false,
dateRange: [],
taskStatusList: [
{ id: '21', name: '入库进行中' },
{ id: '22', name: '入库已完成' },
],
taskStatusList:[{id:'0',name:'未完成'},{id:'1',name:'已完成'}],
ids: [],
// 总条数
total: 0,