From 9a4b1cb24f1997c49ebab8728c28490d4b6f8848 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 18 三月 2024 11:07:28 +0800
Subject: [PATCH] 销售订单查询修改
---
vue.config.js | 2 +-
src/page/wel.vue | 9 ++-------
src/views/common/ztt-table.vue | 3 ++-
3 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/page/wel.vue b/src/page/wel.vue
index d40e4db..4c632dc 100644
--- a/src/page/wel.vue
+++ b/src/page/wel.vue
@@ -1,6 +1,6 @@
<template>
<div class="dashboard-main">
- <div class="body">
+ <!-- <div class="body">
<el-row>
<el-col :span="12">
<p class="todo-title"><i class="el-icon-bell"></i><span> 鐢熶骇璋冨害 路 寰呭姙</span></p>
@@ -63,11 +63,6 @@
</template>
</el-calendar>
<div class="todo-span"><span>寰呭姙</span></div>
- <!-- <el-table :data="todoByDayList">
- <el-table-column label="搴忓彿" align="center" type="index" width="50"></el-table-column>
- <el-table-column prop="product_type" label="浜у搧绫诲瀷" align="center" min-width="50"></el-table-column>
- <el-table-column prop="total" label="寰呭姙鏁伴噺" align="center" min-width="50"></el-table-column>
- </el-table> -->
<div class="todo-info" v-for="(item,index) in 10" :key="index">
<div class="todo-info-state"></div>
</div>
@@ -94,7 +89,7 @@
</el-card>
</el-col>
</el-row>
- </div>
+ </div> -->
</div>
</template>
<style scoped="scoped" lang="scss">
diff --git a/src/views/common/ztt-table.vue b/src/views/common/ztt-table.vue
index 4996b43..2cf2e16 100644
--- a/src/views/common/ztt-table.vue
+++ b/src/views/common/ztt-table.vue
@@ -150,6 +150,7 @@
v-on="$listeners"
:highlight-current-row="true"
:row-key="rowKey"
+ :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
@row-dblclick="dbClickRow"
@row-contextmenu="contextMenu"
@header-click="headClick"
@@ -325,7 +326,7 @@
<template v-else>
<template v-if="!item.render">
<template v-if="item.formatter">
- <span v-if="item.isTag" style="text-align: center;">
+ <span v-if="item.isTag&&scope.row[item.prop]!=null" style="text-align: center;">
<el-tag style="width:60px;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>
diff --git a/vue.config.js b/vue.config.js
index 4f8c558..d821fe5 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -7,7 +7,7 @@
// const url = 'http://192.168.2.7:9999'
// const url = 'https://ztms-mes.chinaztt.cn/'
-const url = 'http://192.168.0.104:9999'
+const url = 'http://127.0.0.1:9999'
const localUrl = 'http://localhost:8089'
--
Gitblit v1.9.3