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

Merge branch 'material-ui' into dev-sy-11-8

This commit is contained in:
BianLzhaoMin 2024-11-08 09:16:18 +08:00
parent 8dd9cd22cb 1814dbaba1
commit cfa7b138b9
3 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/material/ma/partType/index.vue
View File

@ -157,13 +157,13 @@
<el-table-column <el-table-column
label="配件类型" label="配件类型"
align="center" align="center"
prop="label1" prop="partType"
show-overflow-tooltip show-overflow-tooltip
/> />
<el-table-column <el-table-column
label="配件名称" label="配件名称"
align="center" align="center"
prop="label2" prop="partName"
show-overflow-tooltip show-overflow-tooltip
/> />
<el-table-column <el-table-column

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

@ -70,30 +70,29 @@
<el-table-column label="序号" align="center" width="80" type="index"> <el-table-column label="序号" align="center" width="80" type="index">
</el-table-column> </el-table-column>
<el-table-column label="物资名称" align="center" prop="maTypeName" /> <el-table-column label="物资名称" align="center" prop="maTypeName" :show-overflow-tooltip="true"/>
<el-table-column label="规格型号" align="center" prop="typeName" /> <el-table-column label="规格型号" align="center" prop="typeName" :show-overflow-tooltip="true"/>
<el-table-column label="单位" align="center" prop="unitName"/> <el-table-column label="单位" align="center" prop="unitName" :show-overflow-tooltip="true"/>
<el-table-column label="采购数量" align="center" prop="purchaseNum" /> <el-table-column label="采购数量" align="center" prop="purchaseNum" :show-overflow-tooltip="true"/>
<el-table-column label="购置单价(元含税)" align="center" prop="purchaseTaxPrice" /> <el-table-column label="购置单价(元含税)" align="center" prop="purchaseTaxPrice" :show-overflow-tooltip="true"/>
<el-table-column label="购置单价（元不含税）" align="center" prop="purchasePrice" /> <el-table-column label="购置单价（元不含税）" align="center" prop="purchasePrice" :show-overflow-tooltip="true"/>
<!-- <el-table-column label="供应商" align="center" prop="supplierName" /> -->
<el-table-column label="供应商" align="center" prop="supplierName" /> <el-table-column label="是否未固定资产" align="center" prop="fixCodeStr" :show-overflow-tooltip="true"/>
<el-table-column label="出厂日期" align="center" prop="productionTime" /> <el-table-column label="出厂日期" align="center" prop="productionTime" :show-overflow-tooltip="true"/>
<el-table-column label="相关配套资料" align="center" prop=""> <el-table-column label="相关配套资料" align="center" prop="" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<div style="color: rgb(2, 167, 240);cursor: pointer;" @click="openFileDialog(scope.row)">报告管理</div> <div style="color: rgb(2, 167, 240);cursor: pointer;" @click="openFileDialog(scope.row)">报告管理</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="验收结论" align="center" prop="checkResult" /> <el-table-column label="验收结论" align="center" prop="checkResult" :show-overflow-tooltip="true"/>
<el-table-column label="操作" align="center" width="180"> <el-table-column label="操作" align="center" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="success"> <!-- <el-button size="mini" type="success">
合格 合格
</el-button> </el-button>
<el-button size="mini" type="danger"> <el-button size="mini" type="danger">
不合格 不合格
</el-button> </el-button> -->
</template> </template>
</el-table-column> </el-table-column>
@ -186,6 +185,7 @@
total: 0, total: 0,
//表格数据 //表格数据
tableList: [], tableList: [],
fixCodeList:["否","是"],
// 弹出层标题 // 弹出层标题
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
@ -271,6 +271,9 @@
this.queryParams.taskId=this.taskId this.queryParams.taskId=this.taskId
getPurchaseDetailsList(this.queryParams).then(response => { getPurchaseDetailsList(this.queryParams).then(response => {
this.tableList = response.data.purchaseCheckDetailsList; this.tableList = response.data.purchaseCheckDetailsList;
this.tableList.forEach((item) => {
item.fixCodeStr = this.fixCodeList[Number(item.fixCode)]
})
// this.total = response.total; // this.total = response.total;
this.loading = false; this.loading = false;
}); });

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

@ -66,16 +66,17 @@
<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" /> <el-table-column label="到货时间" align="center" prop="arrivalTime" :show-overflow-tooltip="true"/>
<el-table-column label="采购单号" align="center" prop="code" /> <el-table-column label="采购单号" align="center" prop="code" :show-overflow-tooltip="true"/>
<el-table-column label="采购物资" align="center" prop="purchaseMaTypeName" /> <el-table-column label="采购物资" align="center" prop="purchaseMaTypeName" :show-overflow-tooltip="true"/>
<el-table-column label="采购数量" align="center" prop="purchaseMaNumber" /> <el-table-column label="采购数量" align="center" prop="purchaseMaNumber" :show-overflow-tooltip="true"/>
<el-table-column label="采购价格(元含税)" align="center" prop="purchaseTaxPrice" width="80"/> <el-table-column label="采购价格(元含税)" align="center" prop="purchaseTaxPrice" width="80" :show-overflow-tooltip="true"/>
<el-table-column label="采购价格（元不含税）" align="center" prop="purchasePrice" width="98"/> <el-table-column label="采购价格（元不含税）" align="center" prop="purchasePrice" width="80" :show-overflow-tooltip="true"/>
<el-table-column label="税率" align="center" prop="taxRate" /> <el-table-column label="税率" align="center" prop="taxRate" :show-overflow-tooltip="true"/>
<el-table-column label="操作人" align="center" prop="createBy" /> <el-table-column label="物资厂家" align="center" prop="supplier" :show-overflow-tooltip="true"/>
<el-table-column label="操作时间" align="center" prop="createTime" /> <el-table-column label="操作人" align="center" prop="createBy" :show-overflow-tooltip="true"/>
<el-table-column label="状态" align="center" prop="taskStatus"> <el-table-column label="操作时间" align="center" prop="createTime" :show-overflow-tooltip="true"/>
<el-table-column label="状态" align="center" prop="taskStatus" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.taskStatus==0">待提交</span> <span v-if="scope.row.taskStatus==0">待提交</span>
<span v-if="scope.row.taskStatus==1">待通知</span> <span v-if="scope.row.taskStatus==1">待通知</span>