From b5d7cad27e6d6382cc375a7bbfb91aad0c31195c Mon Sep 17 00:00:00 2001 From: zouyu <2723363702@qq.com> Date: 星期二, 31 十月 2023 18:05:56 +0800 Subject: [PATCH] modified: src/api/quality/finishedProduct.js modified: src/api/quality/rawMaterial.js modified: src/router/views/index.js new file: src/views/common/rawMaterial-part.vue modified: src/views/common/ztt-table.vue modified: src/views/quality/finishedProductInspection/finishedProductInspectionAdd.vue modified: src/views/quality/finishedProductInspection/index.vue modified: src/views/quality/rawMaterial/rawMaterial-form.vue --- src/views/common/ztt-table.vue | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/views/common/ztt-table.vue b/src/views/common/ztt-table.vue index a64ec16..724a966 100644 --- a/src/views/common/ztt-table.vue +++ b/src/views/common/ztt-table.vue @@ -327,7 +327,12 @@ <template v-else> <template v-if="!item.render"> <template v-if="item.formatter"> - <span + <span v-if="item.isTag" style="text-align: center;"> + <el-tag style="width:50px;margin: 3px;" :type="scope.row[item.prop] == 0 ? 'success' : 'info'"> + <span v-html="item.formatter(scope.row, item, scope.row[item.prop])"></span> + </el-tag> + </span> + <span v-else v-html=" item.formatter(scope.row, item, scope.row[item.prop]) " @@ -962,7 +967,12 @@ .apply(this, args) .then((response) => { var _this = this - _this.tableData = response.data.data.records + var resultData = response.data.data.records + if(resultData == undefined){ + _this.tableData = response.data.data + }else{ + _this.tableData = response.data.data.records + } _this.pagination.total = response.data.data.total // 缃┖閫変腑 this.$refs.lmesTable.setCurrentRow() -- Gitblit v1.9.3