新购到货验收页面状态显示及状态筛选
This commit is contained in:
parent
6bc41f70a8
commit
7317a7885a
|
|
@ -29,13 +29,13 @@
|
||||||
maxlength="20"
|
maxlength="20"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item prop="isFinish">
|
<el-form-item prop="taskStatusText">
|
||||||
<el-select
|
<el-select
|
||||||
clearable
|
clearable
|
||||||
filterable
|
filterable
|
||||||
style="width: 240px"
|
style="width: 240px"
|
||||||
placeholder="状态筛选"
|
placeholder="状态筛选"
|
||||||
v-model="queryParams.isFinish"
|
v-model="queryParams.taskStatusText"
|
||||||
>
|
>
|
||||||
<el-option
|
<el-option
|
||||||
:key="dict.id"
|
:key="dict.id"
|
||||||
|
|
@ -81,9 +81,9 @@
|
||||||
<span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
|
<span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="到货时间" align="center" prop="arrivalTime" width="110" :show-overflow-tooltip="true"/>
|
<el-table-column label="到货时间" align="center" prop="arrivalTime" width="90" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="采购单号" align="center" prop="code" width="150" :show-overflow-tooltip="true"/>
|
<el-table-column label="采购单号" align="center" prop="code" width="130" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="采购物资" align="center" prop="purchaseMaTypeName" min-width="150" :show-overflow-tooltip="true"/>
|
<el-table-column label="采购物资" align="center" prop="purchaseMaTypeName" min-width="140" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="采购数量" align="center" prop="purchaseMaNumber" width="80" :show-overflow-tooltip="true"/>
|
<el-table-column label="采购数量" align="center" prop="purchaseMaNumber" width="80" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="采购价格(元含税)" align="center" prop="purchaseTaxPrice" width="100" :show-overflow-tooltip="true"/>
|
<el-table-column label="采购价格(元含税)" align="center" prop="purchaseTaxPrice" width="100" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="采购价格(元不含税)" align="center" prop="purchasePrice" width="100" :show-overflow-tooltip="true"/>
|
<el-table-column label="采购价格(元不含税)" align="center" prop="purchasePrice" width="100" :show-overflow-tooltip="true"/>
|
||||||
|
|
@ -93,14 +93,32 @@
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="物资厂家" align="center" prop="supplier" width="120" :show-overflow-tooltip="true"/>
|
<el-table-column label="物资厂家" align="center" prop="supplier" width="120" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="操作人" align="center" prop="createBy" width="100" :show-overflow-tooltip="true"/>
|
<el-table-column label="操作人" align="center" prop="createBy" width="90" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="操作时间" align="center" prop="createTime" width="110" :show-overflow-tooltip="true"/>
|
<el-table-column label="操作时间" align="center" prop="createTime" width="110" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="状态" align="center" prop="taskStatusName" :show-overflow-tooltip="true" width="80">
|
<!-- <el-table-column label="状态" align="center" prop="taskStatusText" :show-overflow-tooltip="true" width="100">-->
|
||||||
<!-- <template slot-scope="scope">-->
|
<!--<!– <template slot-scope="scope">–>-->
|
||||||
<!-- <dict-tag :options="dict.type.purchase_task_status" :value="scope.row.taskStatus"/>-->
|
<!--<!– <dict-tag :options="dict.type.purchase_task_status" :value="scope.row.taskStatus"/>–>-->
|
||||||
<!-- </template>-->
|
<!--<!– </template>–>-->
|
||||||
|
<!-- </el-table-column>-->
|
||||||
|
<el-table-column label="状态" align="center" prop="taskStatusText" :show-overflow-tooltip="true" width="160">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span v-if="scope.row.taskStatusText == '待验收'">
|
||||||
|
<span v-if="scope.row.signLevel == '2'">
|
||||||
|
待验收(安全/技术科)
|
||||||
|
</span>
|
||||||
|
<span v-else-if="scope.row.signLevel == '3'">
|
||||||
|
待验收(库管班)
|
||||||
|
</span>
|
||||||
|
<span v-else>
|
||||||
|
待验收
|
||||||
|
</span>
|
||||||
|
</span>
|
||||||
|
<span v-else>
|
||||||
|
{{ scope.row.taskStatusText }}
|
||||||
|
</span>
|
||||||
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/>
|
<el-table-column label="备注" align="center" width="80" prop="remark" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="操作" align="center" min-width="150" fixed="right">
|
<el-table-column label="操作" align="center" min-width="150" fixed="right">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button
|
<el-button
|
||||||
|
|
@ -127,7 +145,7 @@
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
size="mini"
|
size="mini"
|
||||||
type="primary" v-if="scope.row.taskStatusName == '未完成' && (signLevelDeptMap[scope.row.signLevel] || []).some(name => deptName.includes(name))"
|
type="primary" v-if="scope.row.taskStatusText == '待验收' && (signLevelDeptMap[scope.row.signLevel] || []).some(name => deptName.includes(name))"
|
||||||
@click="handleUpdate(scope.row)"
|
@click="handleUpdate(scope.row)"
|
||||||
>
|
>
|
||||||
验收
|
验收
|
||||||
|
|
@ -292,7 +310,7 @@
|
||||||
showSearch: true,
|
showSearch: true,
|
||||||
showHouse: false,
|
showHouse: false,
|
||||||
dateRange:[],
|
dateRange:[],
|
||||||
taskStatusList:[{id:'0',name:'未完成'},{id:'1',name:'已完成'}],
|
taskStatusList:[{id:'待验收',name:'待验收'},{id:'待绑定',name:'待绑定'},{id:'待入库',name:'待入库'},{id:'入库中',name:'入库中'},{id:'已入库',name:'已入库'}],
|
||||||
ids:[],
|
ids:[],
|
||||||
// 总条数
|
// 总条数
|
||||||
total: 0,
|
total: 0,
|
||||||
|
|
@ -310,6 +328,7 @@
|
||||||
isFinish:undefined,
|
isFinish:undefined,
|
||||||
startTime: undefined,
|
startTime: undefined,
|
||||||
endTime: undefined,
|
endTime: undefined,
|
||||||
|
taskStatusText:undefined
|
||||||
},
|
},
|
||||||
openPrint: false,
|
openPrint: false,
|
||||||
printData: {},
|
printData: {},
|
||||||
|
|
@ -329,7 +348,7 @@
|
||||||
created() {
|
created() {
|
||||||
// 设置默认状态为第一个选项(未完成)
|
// 设置默认状态为第一个选项(未完成)
|
||||||
if (this.taskStatusList.length > 0) {
|
if (this.taskStatusList.length > 0) {
|
||||||
this.queryParams.isFinish = this.taskStatusList[0].id
|
this.queryParams.taskStatusText = this.taskStatusList[0].id
|
||||||
}
|
}
|
||||||
this.getList()
|
this.getList()
|
||||||
},
|
},
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue