diff --git a/src/views/assetManage/assetWhitelist/index.vue b/src/views/assetManage/assetWhitelist/index.vue index 5aee3dc..f996d4d 100644 --- a/src/views/assetManage/assetWhitelist/index.vue +++ b/src/views/assetManage/assetWhitelist/index.vue @@ -23,8 +23,8 @@
- - + + @@ -40,8 +40,16 @@
{{ scope.row.whiteCreateTime | parseTime }}
 - - + + + + + + @@ -54,30 +62,37 @@
-
    -
  • 资产编号：{{ selectedAsset && selectedAsset.mark }}
    • -
  • 资产名称：{{ selectedAsset && selectedAsset.name }}
    • -
  • 资产类型：{{ selectedAsset && selectedAsset.capitaltyepname || '——' }}
    • -
  • 规格型号：{{ selectedAsset && selectedAsset.capitalspec || '——' }}
    • -
  • 设备用途：{{ selectedAsset && selectedAsset.sbyt || '——' }}
    • -
  • 价值类型：{{ selectedAsset && selectedAsset.jzlx || '——' }}
    • -
  • 价值：{{ selectedAsset ? formatMoney(selectedAsset?.startprice) : '——' }}
    • -
  • 数量：{{ selectedAsset && selectedAsset.capitalnum }}
    • -
  • 实际数量：{{ selectedAsset && selectedAsset.sjsl }}
    • -
  • 计量单位：{{ selectedAsset && selectedAsset.unitname }}
    • -
  • 使用部门：{{ selectedAsset && selectedAsset.departmentname }}
    • -
  • 使用人：{{ selectedAsset && selectedAsset.resourcename }}
    • -
  • 所属部门：{{ selectedAsset && selectedAsset.blongdepartmentname }}
    • -
  • 管理人：{{ selectedAsset && selectedAsset.glrname }}
    • -
  • 存放地：{{ selectedAsset && selectedAsset.cfdname }}
    • -
  • 供应商：{{ selectedAsset && selectedAsset.gys }}
    • -
  • 项目名称：{{ selectedAsset && selectedAsset.xmmc }}
    • -
  • 无线电设备用途：{{ selectedAsset && selectedAsset.wxdsbyt }}
    • -
  • 领用日期：{{ selectedAsset && selectedAsset.deprestartdate | parseTime }}
    • -
  • 投入使用日期：{{ selectedAsset && selectedAsset.trsyrq | parseTime }}
    • -
  • 入账日期：{{ selectedAsset && selectedAsset.rzrq | parseTime }}
    • -
  • 保修截至日期：{{ selectedAsset && selectedAsset.bxjzrq | parseTime }}
    • -
+
+
    +
  • 资产编号：{{ selectedAsset && selectedAsset.mark }}
    • +
  • 资产名称：{{ selectedAsset && selectedAsset.name }}
    • +
  • 资产类型：{{ selectedAsset && selectedAsset.capitaltyepname || '——' }}
    • +
  • 规格型号：{{ selectedAsset && selectedAsset.capitalspec || '——' }}
    • +
  • 设备用途：{{ selectedAsset && selectedAsset.sbyt || '——' }}
    • +
  • 价值类型：{{ selectedAsset && selectedAsset.jzlx || '——' }}
    • +
  • 价值：{{ selectedAsset ? formatMoney(selectedAsset?.startprice) : '——' }}
    • +
  • 数量：{{ selectedAsset && selectedAsset.capitalnum }}
    • +
  • 实际数量：{{ selectedAsset && selectedAsset.sjsl }}
    • +
  • 计量单位：{{ selectedAsset && selectedAsset.unitname }}
    • +
  • 使用部门：{{ selectedAsset && selectedAsset.departmentname }}
    • +
  • 使用人：{{ selectedAsset && selectedAsset.resourcename }}
    • +
  • 所属部门：{{ selectedAsset && selectedAsset.blongdepartmentname }}
    • +
  • 管理人：{{ selectedAsset && selectedAsset.glrname }}
    • +
  • 存放地：{{ selectedAsset && selectedAsset.cfdname }}
    • +
  • 供应商：{{ selectedAsset && selectedAsset.gys }}
    • +
  • 项目名称：{{ selectedAsset && selectedAsset.xmmc }}
    • +
  • 无线电设备用途：{{ selectedAsset && selectedAsset.wxdsbyt }}
    • +
  • 领用日期：{{ selectedAsset && selectedAsset.deprestartdate | parseTime }}
    • +
  • 投入使用日期：{{ selectedAsset && selectedAsset.trsyrq | parseTime }}
    • +
  • 入账日期：{{ selectedAsset && selectedAsset.rzrq | parseTime }}
    • +
  • 保修截至日期：{{ selectedAsset && selectedAsset.bxjzrq | parseTime }}
    • +
+
    +
  • 加入时间：{{ selectedAsset && selectedAsset.whiteCreateTime | parseTime }}
    • +
  • 操作人：{{ selectedAsset && selectedAsset.whiteLastname || '——' }}
    • +
  • 备注：{{ selectedAsset && selectedAsset.whiteRemark || '——' }}
    • +
+
@@ -226,7 +241,27 @@ export default { mounted() { }, methods: { + // 数据单元格样式 + cellClassName({ row, column, rowIndex, columnIndex }) { + const whiteFields = ['whiteCreateTime', 'whiteLastname', 'whiteRemark'] + if (whiteFields.includes(column.property)) { + return 'white-list-cell' + } + return '' + }, + // 表头单元格样式 + headerCellClassName({ row, column, rowIndex, columnIndex }) { + const whiteFields = ['whiteCreateTime', 'whiteLastname', 'whiteRemark'] + if (whiteFields.includes(column.property)) { + return 'white-list-header-cell' + } + return '' + }, + [CRUD.HOOK.beforeRefresh]() { + if (this.crud.query.search) { + this.crud.query.search = this.crud.query.search.trim() + } this.crud.params.isWhite = true // 保存原始参数 this.originalPage = this.crud.page.page @@ -266,14 +301,21 @@ export default { return Number(money).toLocaleString('en-US') }, // 处理行双击事件 + // 处理行双击事件 handleRowDblClick(row) { this.detailDialogVisible = true this.selectedAsset = {} this.assetImageList = [] const params = { mark: row.mark } FetchAssetInfoDetailsByMark(params).then(res => { - this.selectedAsset = res || row - const photoList = res.assetInfoPhoto || [] + // 合并详情接口数据 + 列表行的白名单字段 + this.selectedAsset = { + ...(res || {}), + whiteCreateTime: row.whiteCreateTime, + whiteLastname: row.whiteLastname, + whiteRemark: row.whiteRemark + } + const photoList = res?.assetInfoPhoto || [] this.assetImageList = photoList.map(item => ({ id: item.id, photoUrl: item.photoUrl, @@ -311,7 +353,7 @@ export default { this.addDialogLoading = true try { const res = await FetchInitAssetInfo({ - search: this.addSearch, + search: this.addSearch.trim(), pageNo: this.addPage.pageNo, pageSize: this.addPage.pageSize }) @@ -552,8 +594,9 @@ export default { display: flex; justify-content: space-between; align-items: flex-start; - padding: 20px 30px; + padding: 12px 30px; background-color: #F6F8FC; + overflow: hidden; } .book-detail{ display: flex; @@ -575,6 +618,17 @@ export default { &.row-li{ width: 100% } + &.white-item { + color: #606266; + span { + color: #0348F3 !important; + } + } + } + &.white-detail{ + border-radius: 4px; + background-color: #EEF5FE; + margin-top: 4px; } } ::v-deep .dialog-footer{ @@ -587,4 +641,13 @@ export default { ::v-deep .el-table__fixed-right{ background-color: #fff !important; } +// 数据行单元格 +::v-deep .white-list-cell { + // background-color: #EAF3FB !important; + color: #0348F3 !important; +} +// 表头单元格 +::v-deep .white-list-header-cell { + background-color: #EAF3FB !important; +} diff --git a/src/views/assetManage/errorLog/index.vue b/src/views/assetManage/errorLog/index.vue index abcf8fe..b3e0593 100644 --- a/src/views/assetManage/errorLog/index.vue +++ b/src/views/assetManage/errorLog/index.vue @@ -167,7 +167,7 @@ export default { delete this.crud.query.billNo delete this.crud.query.manageType this.crud.query.isImportant = false - this.crud.query.search = this.query.search + this.crud.query.search = this.query.search.trim() // 状态筛选 this.crud.params.manageType = this.query.manageType diff --git a/src/views/assetManage/importantLog/index.vue b/src/views/assetManage/importantLog/index.vue index 706ab34..ac3845a 100644 --- a/src/views/assetManage/importantLog/index.vue +++ b/src/views/assetManage/importantLog/index.vue @@ -167,7 +167,7 @@ export default { delete this.crud.query.billNo delete this.crud.query.manageType this.crud.query.isImportant = true - this.crud.query.search = this.query.search + this.crud.query.search = this.query.search.trim() // 状态筛选 this.crud.params.manageType = this.query.manageType diff --git a/src/views/assetManage/inOutLog/index.vue b/src/views/assetManage/inOutLog/index.vue index 8fba22e..20789a7 100644 --- a/src/views/assetManage/inOutLog/index.vue +++ b/src/views/assetManage/inOutLog/index.vue @@ -319,7 +319,7 @@ export default { delete this.crud.query.manageType // 输入框统一作为 单号 billNo 搜索 - this.crud.query.billNo = this.keyWord + this.crud.query.billNo = this.keyWord.trim() // 下拉框选择 出入库类型 manageType if (this.optionVal) { diff --git a/src/views/assetManage/inventory/index.vue b/src/views/assetManage/inventory/index.vue index 5ac8b33..6c6aba8 100644 --- a/src/views/assetManage/inventory/index.vue +++ b/src/views/assetManage/inventory/index.vue @@ -98,34 +98,41 @@ -->
-
    -
  • 资产编号：{{ selectedAsset && selectedAsset.mark }}
    • -
  • 资产名称：{{ selectedAsset && selectedAsset.name }}
    • -
  • 资产类型：{{ selectedAsset && selectedAsset.capitaltyepname || '——' }}
    • -
  • 规格型号：{{ selectedAsset && selectedAsset.capitalspec || '——' }}
    • -
  • 设备用途：{{ selectedAsset && selectedAsset.sbyt || '——' }}
    • -
  • 价值类型：{{ selectedAsset && selectedAsset.jzlx || '——' }}
    • -
  • 价值：{{ selectedAsset ? formatMoney(selectedAsset?.startprice) : '——' }}
    • -
  • 数量：{{ selectedAsset && selectedAsset.capitalnum }}
    • -
  • 实际数量：{{ selectedAsset && selectedAsset.sjsl }}
    • -
  • 计量单位：{{ selectedAsset && selectedAsset.unitname }}
    • -
  • 使用部门：{{ selectedAsset && selectedAsset.departmentname }}
    • -
  • 使用人：{{ selectedAsset && selectedAsset.resourcename }}
    • - -
  • 所属部门：{{ selectedAsset && selectedAsset.blongdepartmentname }}
    • -
  • 管理人：{{ selectedAsset && selectedAsset.glrname }}
    • -
  • 存放地：{{ selectedAsset && selectedAsset.cfdname }}
    • -
  • 供应商：{{ selectedAsset && selectedAsset.gys }}
    • -
  • 项目名称：{{ selectedAsset && selectedAsset.xmmc }}
    • -
  • 无线电设备用途：{{ selectedAsset && selectedAsset.wxdsbyt }}
    • -
  • 领用日期：{{ selectedAsset && selectedAsset.deprestartdate | parseTime }}
    • - -
  • 投入使用日期：{{ selectedAsset && selectedAsset.trsyrq | parseTime }}
    • -
  • 入账日期：{{ selectedAsset && selectedAsset.rzrq | parseTime }}
    • -
  • 保修截至日期：{{ selectedAsset && selectedAsset.bxjzrq | parseTime }}
    • +
    +
      +
    • 资产编号：{{ selectedAsset && selectedAsset.mark }}
      • +
    • 资产名称：{{ selectedAsset && selectedAsset.name }}
      • +
    • 资产类型：{{ selectedAsset && selectedAsset.capitaltyepname || '——' }}
      • +
    • 规格型号：{{ selectedAsset && selectedAsset.capitalspec || '——' }}
      • +
    • 设备用途：{{ selectedAsset && selectedAsset.sbyt || '——' }}
      • +
    • 价值类型：{{ selectedAsset && selectedAsset.jzlx || '——' }}
      • +
    • 价值：{{ selectedAsset ? formatMoney(selectedAsset?.startprice) : '——' }}
      • +
    • 数量：{{ selectedAsset && selectedAsset.capitalnum }}
      • +
    • 实际数量：{{ selectedAsset && selectedAsset.sjsl }}
      • +
    • 计量单位：{{ selectedAsset && selectedAsset.unitname }}
      • +
    • 使用部门：{{ selectedAsset && selectedAsset.departmentname }}
      • +
    • 使用人：{{ selectedAsset && selectedAsset.resourcename }}
      • + +
    • 所属部门：{{ selectedAsset && selectedAsset.blongdepartmentname }}
      • +
    • 管理人：{{ selectedAsset && selectedAsset.glrname }}
      • +
    • 存放地：{{ selectedAsset && selectedAsset.cfdname }}
      • +
    • 供应商：{{ selectedAsset && selectedAsset.gys }}
      • +
    • 项目名称：{{ selectedAsset && selectedAsset.xmmc }}
      • +
    • 无线电设备用途：{{ selectedAsset && selectedAsset.wxdsbyt }}
      • +
    • 领用日期：{{ selectedAsset && selectedAsset.deprestartdate | parseTime }}
      • + +
    • 投入使用日期：{{ selectedAsset && selectedAsset.trsyrq | parseTime }}
      • +
    • 入账日期：{{ selectedAsset && selectedAsset.rzrq | parseTime }}
      • +
    • 保修截至日期：{{ selectedAsset && selectedAsset.bxjzrq | parseTime }}
      • -
    +
+
    +
  • 加入时间：{{ selectedAsset && selectedAsset.whiteCreateTime | parseTime }}
    • +
  • 操作人：{{ selectedAsset && selectedAsset.whiteLastname || '——' }}
    • +
  • 备注：{{ selectedAsset && selectedAsset.whiteRemark || '——' }}
    • +
+