This commit is contained in:
mashuai 2025-10-23 17:41:43 +08:00
parent 1b3fab221a
commit c2b97818e9
3 changed files with 13 additions and 12 deletions

View File

@ -88,7 +88,7 @@
<el-table-column label="采购价格(含税)" align="center" prop="purchasePrice" :show-overflow-tooltip="true"/> <el-table-column label="采购价格(含税)" align="center" prop="purchasePrice" :show-overflow-tooltip="true"/>
<el-table-column label="采购价格(不含税)" align="center" prop="purchasePriceNoTax" :show-overflow-tooltip="true"/> <el-table-column label="采购价格(不含税)" align="center" prop="purchasePriceNoTax" :show-overflow-tooltip="true"/>
<el-table-column label="物资厂家" align="center" prop="supplierName" :show-overflow-tooltip="true"/> <el-table-column label="物资厂家" align="center" prop="supplierName" :show-overflow-tooltip="true"/>
<el-table-column label="采购时间" align="center" prop="purchaseTime" :show-overflow-tooltip="true"/> <el-table-column label="到货时间" align="center" prop="purchaseTime" :show-overflow-tooltip="true"/>
<el-table-column label="验收时间" align="center" prop="passTime" :show-overflow-tooltip="true"/> <el-table-column label="验收时间" align="center" prop="passTime" :show-overflow-tooltip="true"/>
<el-table-column label="入库时间" align="center" prop="inputTime" :show-overflow-tooltip="true"/> <el-table-column label="入库时间" align="center" prop="inputTime" :show-overflow-tooltip="true"/>
<el-table-column label="入库人员" align="center" prop="inputUser" :show-overflow-tooltip="true"/> <el-table-column label="入库人员" align="center" prop="inputUser" :show-overflow-tooltip="true"/>
@ -501,6 +501,7 @@
this.openWaitRecord = true this.openWaitRecord = true
this.dialogWaitQuery.keyWord = "" this.dialogWaitQuery.keyWord = ""
this.dialogWaitQuery.taskId = row.taskId; this.dialogWaitQuery.taskId = row.taskId;
this.dialogWaitQuery.typeId = row.typeId;
this.getDialogWaitDataList() this.getDialogWaitDataList()
}, },
/** 查询采购数量弹框列表 */ /** 查询采购数量弹框列表 */

View File

@ -61,7 +61,7 @@
<span v-else>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index }}</span> <span v-else>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="仓库信息" align="center" prop="whHouseName" :show-overflow-tooltip="true"/> <!-- <el-table-column label="仓库信息" align="center" prop="whHouseName" :show-overflow-tooltip="true"/>-->
<el-table-column label="施工类型" align="center" prop="constructionType" :show-overflow-tooltip="true"/> <el-table-column label="施工类型" align="center" prop="constructionType" :show-overflow-tooltip="true"/>
<el-table-column label="物资类型" align="center" prop="materialType" :show-overflow-tooltip="true"/> <el-table-column label="物资类型" align="center" prop="materialType" :show-overflow-tooltip="true"/>
<el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true"/> <el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
@ -90,7 +90,7 @@
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="定损数量" align="center" prop="dsNum" :show-overflow-tooltip="true"> <el-table-column label="待修数量" align="center" prop="dsNum" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.$index !== 0" class="clickText" @click="openRepairRecords(scope.row,1)"> <span v-if="scope.$index !== 0" class="clickText" @click="openRepairRecords(scope.row,1)">
{{ scope.row.dsNum }} {{ scope.row.dsNum }}
@ -154,18 +154,18 @@
</span> </span>
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column label="已审核报废数量" align="center" prop="scrapNum" :show-overflow-tooltip="true"> <!-- <el-table-column label="已审核报废数量" align="center" prop="scrapNum" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.$index !== 0" class="clickText" @click="openAuditedRecords(scope.row)"> <span v-if="scope.$index !== 0" class="clickText" @click="openAuditedRecords(scope.row)">
{{ scope.row.scrapNum }} {{ scope.row.scrapNum }}
</span> </span>
<!-- 否则直接显示数字 --> &lt;!&ndash; 否则直接显示数字 &ndash;&gt;
<!-- <span v-else> &lt;!&ndash; <span v-else>
{{ scope.row.repairInputNum }} {{ scope.row.repairInputNum }}
</span> --> </span> &ndash;&gt;
<!-- <span class="clickText" @click="openTestedRecords(scope.row)">{{ scope.row.repairInputNum }}</span> --> &lt;!&ndash; <span class="clickText" @click="openTestedRecords(scope.row)">{{ scope.row.repairInputNum }}</span> &ndash;&gt;
</template> </template>
</el-table-column> </el-table-column>-->
<el-table-column label="总保有量" align="center" prop="allNum" :show-overflow-tooltip="true"> <el-table-column label="总保有量" align="center" prop="allNum" :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column label="总保有量资产(万元)" align="center" prop="totalPrice" :show-overflow-tooltip="true" /> <el-table-column label="总保有量资产(万元)" align="center" prop="totalPrice" :show-overflow-tooltip="true" />
@ -222,9 +222,9 @@
<el-table-column label="原值(元)" align="center" prop="buyPrice" :show-overflow-tooltip="true"/> <el-table-column label="原值(元)" align="center" prop="buyPrice" :show-overflow-tooltip="true"/>
<el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true"/> <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true"/>
<el-table-column label="库管员" align="center" prop="maKeeper" :show-overflow-tooltip="true"/> <el-table-column label="库管员" align="center" prop="maKeeper" :show-overflow-tooltip="true"/>
<el-table-column label="操作人" align="center" prop="inputUser" :show-overflow-tooltip="true"/> <!-- <el-table-column label="操作人" align="center" prop="inputUser" :show-overflow-tooltip="true"/>
<el-table-column label="入库时间" align="center" prop="inputTime" :show-overflow-tooltip="true"/> <el-table-column label="入库时间" align="center" prop="inputTime" :show-overflow-tooltip="true"/>
<el-table-column label="入库方式" align="center" prop="inputType" :show-overflow-tooltip="true"/> <el-table-column label="入库方式" align="center" prop="inputType" :show-overflow-tooltip="true"/>-->
</el-table> </el-table>
<pagination <pagination
v-show="dialogTotal > 0" v-show="dialogTotal > 0"

View File

@ -127,7 +127,7 @@
<el-table-column label="归还数量" align="center" prop="backNum"></el-table-column> <el-table-column label="归还数量" align="center" prop="backNum"></el-table-column>
<el-table-column label="在用数量" align="center" prop="usNum"></el-table-column> <el-table-column label="在用数量" align="center" prop="usNum"></el-table-column>
<el-table-column label="在用总价值(元)" align="center" prop="usPrice"></el-table-column> <el-table-column label="在用总价值(元)" align="center" prop="usPrice"></el-table-column>
<el-table-column label="投入总价值(元)" align="center" prop="totalPrice" /> <!-- <el-table-column label="投入总价值(元)" align="center" prop="totalPrice" />-->
<el-table-column label="协议状态" align="center" prop="isSltName" :show-overflow-tooltip="true"/> <el-table-column label="协议状态" align="center" prop="isSltName" :show-overflow-tooltip="true"/>
</el-table> </el-table>
<pagination <pagination