From eb2622b27b78f372d8e89ad7afde56c79532ac98 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 26 三月 2024 10:32:16 +0800
Subject: [PATCH] 1.仓库看板字段修改
---
vue.config.js | 4 +-
src/views/kb/warehouse.vue | 68 ++++++++++++++++++----------------
2 files changed, 38 insertions(+), 34 deletions(-)
diff --git a/src/views/kb/warehouse.vue b/src/views/kb/warehouse.vue
index c04940a..71eb685 100644
--- a/src/views/kb/warehouse.vue
+++ b/src/views/kb/warehouse.vue
@@ -113,7 +113,7 @@
width="160"
>
<template slot-scope="{row}">
- <div v-if="row.totalStockInQuantity">{{ row.totalStockInQuantity }}</div>
+ <div v-if="row.countInQuantity">{{ row.countInQuantity }}</div>
<div v-else>0</div>
</template>
</el-table-column>
@@ -157,22 +157,26 @@
</el-table-column>
<el-table-column
+ prop="customecode"
+ label="瀹㈡埛缂栫爜"
+ width="200"
+ />
+ <el-table-column
+ prop="customename"
+ label="瀹㈡埛鍚嶇О"
+ width="330"
+ >
+ <template slot-scope="{row}">
+ <div class="ellipsis">{{ row.customename }}</div>
+ </template>
+ </el-table-column>
+ <el-table-column
prop="materiel_name"
label="浜у搧鍚嶇О"
width="258"
>
<template slot-scope="{row}">
<div v-if="row.materiel_name" class="ellipsis">{{ row.materiel_name }}</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="specification"
- label="瑙勬牸鍨嬪彿"
- width="200"
- >
- <template slot-scope="{row}">
- <div v-if="row.specification" class="ellipsis">{{ row.specification }}</div>
- <div v-else>/</div>
</template>
</el-table-column>
<el-table-column
@@ -195,27 +199,27 @@
</template>
</el-table-column>
- <el-table-column
- prop="deliveryDate"
- label="棰勮浜や粯鏃ユ湡"
- width="200"
- >
- <template slot-scope="{row}">
- <div v-if="row.deliveryDate">{{ row.deliveryDate.substring(0,10) }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
+ <!-- <el-table-column-->
+ <!-- prop="deliveryDate"-->
+ <!-- label="棰勮浜や粯鏃ユ湡"-->
+ <!-- width="200"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.deliveryDate">{{ row.deliveryDate.substring(0,10) }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
- <el-table-column
- prop="warning"
- label="寤舵湡澶╂暟"
- width="130"
- >
- <template slot-scope="{row}">
- <div v-if="row.warning">{{ row.warning }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
+ <!-- <el-table-column-->
+ <!-- prop="warning"-->
+ <!-- label="寤舵湡澶╂暟"-->
+ <!-- width="130"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.warning">{{ row.warning }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
</el-table>
</div>
</div>
@@ -235,7 +239,7 @@
<div style="height: 470px;margin-top: 30px;">
<div class="smallTitle">
<svg-icon icon-class="ph" class="svg_class" />
- 杩戜竴鍛ㄩ攢鍞緟鍙戣揣浜у搧鎺掕Top5
+ 杩戜竴鍛ㄩ攢鍞凡鍙戣揣浜у搧鎺掕Top5
</div>
<div class="lineContent horn" style="height: 410px">
<div id="bar04" style="width: 100%;height:100%;" />
diff --git a/vue.config.js b/vue.config.js
index c92ff60..5a3ecee 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -39,8 +39,8 @@
},
proxy: {
[process.env.VUE_APP_BASE_API]: {
- // target: 'http://121.196.36.24:8029', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鏈湴寮�鍙戞湇鍔″櫒
- target: 'http://192.168.0.111:8001', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 瀹㈡埛鏈嶅姟鍣�
+ target: 'http://121.196.36.24:8029', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鏈湴寮�鍙戞湇鍔″櫒
+ // target: 'http://192.168.0.111:8001', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 瀹㈡埛鏈嶅姟鍣�
changeOrigin: true, // 璇锋眰璺ㄥ煙鏃讹紝闇� 閰嶇疆姝ら」
pathRewrite: { // 璺緞閲嶅啓,鏇挎崲target涓殑璇锋眰鍦板潃
['^' + process.env.VUE_APP_BASE_API]: '/api/'
--
Gitblit v1.9.3