diff --git a/src/components/GoBack/index.vue b/src/components/GoBack/index.vue index 9a449ae0..aaf4ae98 100644 --- a/src/components/GoBack/index.vue +++ b/src/components/GoBack/index.vue @@ -25,13 +25,14 @@ export default { diff --git a/src/views/EquipmentRoamRecord/outboundRecord/index.vue b/src/views/EquipmentRoamRecord/outboundRecord/index.vue index b82eaef2..8ae11a1d 100644 --- a/src/views/EquipmentRoamRecord/outboundRecord/index.vue +++ b/src/views/EquipmentRoamRecord/outboundRecord/index.vue @@ -1,9 +1,8 @@ - - - + + - + 出库记录列表 @@ -87,7 +86,7 @@ - + {{ typeInfo[scope.row.type] }}记录单 @@ -106,13 +105,6 @@ - - - 下载 - - 打印 - 关闭 - 出库记录单 @@ -163,7 +155,15 @@ - + - - - - + + + - - + - - 出库申请设备 + + 出库申请设备 + 共{{tableList.length}}条记录 - 添加 - 确定申请 + 添加 + 确定申请 @@ -136,13 +135,13 @@ - {{ row.remainingYears }} + {{ row.remainingYears }} {{ row.remainingYears }} - 删除 @@ -154,7 +153,7 @@ - + 查询 - 重置 - 确定添加 + 重置 - @@ -281,7 +279,7 @@ }} - + {{ '装备' }} {{ '工具' }} @@ -298,7 +296,7 @@ - + {{ 1 }} + + + 取消 + 确定添加 + @@ -1111,6 +1113,17 @@ export default { + diff --git a/src/views/business/audit/addAudit.vue b/src/views/business/audit/addAudit.vue index 9d8a3557..d518f23d 100644 --- a/src/views/business/audit/addAudit.vue +++ b/src/views/business/audit/addAudit.vue @@ -1,18 +1,15 @@ - - + - - - - - - + + + + + - @@ -28,17 +25,130 @@ - - + - - - - 出库审核列表1 + + + + + 审批进度 + + + + + + + 节点{{ node.nodeOrder }}:{{ node.nodeName }} + + {{ getNodeStatusLabel(node) }} + + + + 审批人:{{ node.name }} + + 审批结果:{{ getNodeRecord(node).approveResult === '1' ? '通过' : '驳回' }} + 审批意见:{{ getNodeRecord(node).approveOpinion }} + 审批时间:{{ getNodeRecord(node).approveTime }} + + + 状态:待审批 + + + 状态:等待上一节点审批 + + + + + + + + 审批操作 + + + + + + 通过 + 驳回 + 取消 + + + + - + + + + 出库审核列表 + 共{{tableList.length}}条记录 + + + + + + {{ "装备" }} + {{ "工具" }} + + + + + + + + {{ "编码设备" }} + {{ "数量设备" }} + + + + + + + + {{ + scope.row.useStartTime && scope.row.useEndTime + ? `${scope.row.useStartTime} 至 ${scope.row.useEndTime}` + : '暂无时间段' + }} + + + + + + + {{ scope.row.useStartTime && scope.row.useEndTime ? `${scope.row.useStartTime} 至 ${scope.row.useEndTime}` @@ -85,10 +194,8 @@ - - - - + + 审批进度 @@ -98,17 +205,6 @@ :timestamp="getNodeRecord(node) ? getNodeRecord(node).approveTime : ''" placement="top" > - - - - - - - - - - - 节点{{ node.nodeOrder }}:{{ node.nodeName }} @@ -131,18 +227,9 @@ - - - - - - - - - 审批操作 @@ -162,10 +249,8 @@ 取消 - - + - - - - - - + --> @@ -590,6 +669,32 @@ export default { diff --git a/src/views/business/outbound/details.vue b/src/views/business/outbound/details.vue index 6800fd85..dde2dfab 100644 --- a/src/views/business/outbound/details.vue +++ b/src/views/business/outbound/details.vue @@ -1,10 +1,9 @@ - - - - + + + - - + - - 出库执行列表 + + 出库执行列表 + 共{{tableList.length}}条记录 - + 全部出库 全部取消出库 @@ -191,13 +190,9 @@ - 出库 - - 取消出库 + 出库 + + 取消出库 @@ -483,4 +478,30 @@ export default { diff --git a/src/views/business/outbound/index.vue b/src/views/business/outbound/index.vue index e0f57684..e7ba755e 100644 --- a/src/views/business/outbound/index.vue +++ b/src/views/business/outbound/index.vue @@ -1,8 +1,8 @@ - - + + - + 出库执行列表 @@ -88,11 +88,11 @@ - 查看 - 出库 + 出库 @@ -197,6 +197,32 @@ export default { + diff --git a/src/views/stockManagement/entryApply/components/AddCode.vue b/src/views/stockManagement/entryApply/components/AddCode.vue index 0638733a..acbe1d46 100644 --- a/src/views/stockManagement/entryApply/components/AddCode.vue +++ b/src/views/stockManagement/entryApply/components/AddCode.vue @@ -1,6 +1,6 @@ - + - 点击填充 - + - 暂存 - + 暂存 + @@ -144,11 +144,9 @@ 删除 @@ -254,7 +252,7 @@ @@ -274,7 +272,7 @@ - 上传 + 上传 查看 diff --git a/src/views/stockManagement/entryApply/components/AddEquip.vue b/src/views/stockManagement/entryApply/components/AddEquip.vue index 1f0d9545..9b6428be 100644 --- a/src/views/stockManagement/entryApply/components/AddEquip.vue +++ b/src/views/stockManagement/entryApply/components/AddEquip.vue @@ -27,7 +27,7 @@ @@ -436,7 +436,7 @@ diff --git a/src/views/stockManagement/entryApply/components/AddNum.vue b/src/views/stockManagement/entryApply/components/AddNum.vue index af8e58a9..54491633 100644 --- a/src/views/stockManagement/entryApply/components/AddNum.vue +++ b/src/views/stockManagement/entryApply/components/AddNum.vue @@ -1,6 +1,6 @@ - + - + - 暂存 @@ -68,12 +68,10 @@ - 删除 @@ -120,7 +118,7 @@ - 上传 + 上传 查看 diff --git a/src/views/stockManagement/entryApply/components/EquipmentAdd.vue b/src/views/stockManagement/entryApply/components/EquipmentAdd.vue index 24241c57..a81750c6 100644 --- a/src/views/stockManagement/entryApply/components/EquipmentAdd.vue +++ b/src/views/stockManagement/entryApply/components/EquipmentAdd.vue @@ -2,7 +2,7 @@ - + @@ -68,7 +68,7 @@ - 查询 + 查询 重置 @@ -78,13 +78,13 @@ - + - + 新增装备 - 批量导入 + 批量导入 --> - + 查看 编辑 - + 保存 删除 @@ -547,7 +546,7 @@ @@ -578,7 +577,7 @@ @@ -598,7 +597,7 @@ - 上传 0) " size="mini" - type="text" + type="text" style="color: #2CBAB2;" @click="handleView(currentRow, row.type)" > 查看 @@ -1705,4 +1704,10 @@ export default { ::v-deep .el-input-number.is-without-controls .el-input__inner { text-align: left; } + + +::v-deep.el-button--primary{ + background-color: #2CBAB2; + border-color: #2CBAB2; +} diff --git a/src/views/stockManagement/entryApply/index.vue b/src/views/stockManagement/entryApply/index.vue index 4684c6e9..b19840ff 100644 --- a/src/views/stockManagement/entryApply/index.vue +++ b/src/views/stockManagement/entryApply/index.vue @@ -1,13 +1,13 @@ - + @@ -42,17 +42,17 @@ - 查询 - 重置 + 查询 + 重置 - + - 新增 - 申请提交 + 新增 + 申请提交 @@ -94,20 +94,20 @@ - 编辑 删除 - 提交 @@ -293,4 +293,31 @@ export default { } - + diff --git a/src/views/stockManagement/inventoryAudit/index.vue b/src/views/stockManagement/inventoryAudit/index.vue index f2bb9d81..1a69e0b6 100644 --- a/src/views/stockManagement/inventoryAudit/index.vue +++ b/src/views/stockManagement/inventoryAudit/index.vue @@ -1,13 +1,13 @@ - + @@ -37,13 +37,13 @@ - 查询 - 重置 + 查询 + 重置 - + - 查看 - 审核 - 驳回 + 查看 + 审核 + 驳回 @@ -259,4 +259,31 @@ export default { } - + diff --git a/src/views/stockManagement/storageRecord/index.vue b/src/views/stockManagement/storageRecord/index.vue index 658809c9..da854efd 100644 --- a/src/views/stockManagement/storageRecord/index.vue +++ b/src/views/stockManagement/storageRecord/index.vue @@ -1,13 +1,13 @@ - + @@ -37,13 +37,13 @@ - 查询 - 重置 + 查询 + 重置 - + @@ -68,7 +68,7 @@ - 详情记录 + 详情记录 @@ -85,8 +85,8 @@ - 下载 - 打印 + 下载 + 打印 @@ -260,6 +260,17 @@ export default {