From b0cd187ac6eb1df56a572ac52afc42869269fea9 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期五, 22 九月 2023 20:33:30 +0800
Subject: [PATCH] 平台端
---
platform/public/template/goods_import_modle.xlsx | 0
platform/src/views/business/company.vue | 6 ++++--
platform/.env.production | 2 +-
platform/.env.development | 2 +-
platform/src/views/business/goods.vue | 4 +++-
platform/.env.staging | 2 +-
platform/vue.config.js | 13 +++++++++++++
7 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/platform/.env.development b/platform/.env.development
index acb28c2..0b72619 100644
--- a/platform/.env.development
+++ b/platform/.env.development
@@ -12,4 +12,4 @@
VUE_APP_API = 'http://192.168.0.35:10023'
# #娴嬭瘯鏈嶅姟鍣�
-# VUE_APP_API = 'https://dmtest.ahapp.net/preselect_admin_interface'
+VUE_APP_API = 'https://dmtest.ahapp.net/preselect_admin_interface'
diff --git a/platform/.env.production b/platform/.env.production
index 5c2b951..0693cdc 100644
--- a/platform/.env.production
+++ b/platform/.env.production
@@ -8,4 +8,4 @@
# http://yx.ahapp.net/admin_interface/doc.html
# VUE_APP_API = 'https://yx.ahapp.net/admin_interface'
-VUE_APP_API = 'http://127.0.0.1:10023/
\ No newline at end of file
+VUE_APP_API = 'https://127.0.0.1:10023/
\ No newline at end of file
diff --git a/platform/.env.staging b/platform/.env.staging
index 81c73c4..5aa1555 100644
--- a/platform/.env.staging
+++ b/platform/.env.staging
@@ -7,4 +7,4 @@
# https://dmtest.ahapp.net/preselect_admin_interface/doc.html
VUE_APP_API = 'https://dmtest.ahapp.net/preselect_admin_interface'
-VUE_APP_API = 'http://127.0.0.1:10023'
+VUE_APP_API = 'https://127.0.0.1:10023'
diff --git a/platform/public/template/goods_import_modle.xlsx b/platform/public/template/goods_import_modle.xlsx
index 87678a5..31b678a 100644
--- a/platform/public/template/goods_import_modle.xlsx
+++ b/platform/public/template/goods_import_modle.xlsx
Binary files differ
diff --git a/platform/src/views/business/company.vue b/platform/src/views/business/company.vue
index ce296b3..8db04cd 100644
--- a/platform/src/views/business/company.vue
+++ b/platform/src/views/business/company.vue
@@ -35,7 +35,7 @@
<el-table v-loading="isWorking.search" :data="tableData.list" border stripe
@selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center"></el-table-column> -->
- <el-table-column prop="id" label="浼佷笟缂栧彿" min-width="80px" align="center"></el-table-column>
+ <el-table-column prop="id" label="浼佷笟缂栧彿" fixed="left" min-width="80px" align="center"></el-table-column>
<el-table-column prop="name" label="浼佷笟鍚嶇О" min-width="100px" align="center"></el-table-column>
<el-table-column prop="managerUserName" label="鐧诲綍璐﹀彿" min-width="100px" align="center"></el-table-column>
<el-table-column prop="linkname" label="鑱旂郴浜�" min-width="100px" align="center"></el-table-column>
@@ -46,7 +46,9 @@
{{ row.userNum || '涓嶉檺' }}
</template>
</el-table-column>
+ <el-table-column prop="anchorUserNum" label="涓绘挱鏁�" min-width="100px" align="center"></el-table-column>
<el-table-column prop="empUserNum" label="鍛樺伐鏁�" min-width="100px" align="center"></el-table-column>
+ <el-table-column prop="goodsNum" label="鍟嗗搧鏁�" min-width="100px" align="center"></el-table-column>
<el-table-column prop="salesmanRealName" label="閿�鍞汉鍛�" min-width="100px" align="center"></el-table-column>
<el-table-column prop="status" label="鐘舵��" min-width="100px" align="center">
<template slot-scope="{row}">
@@ -59,7 +61,7 @@
</el-table-column>
<el-table-column prop="createTime" label="鍒涘缓鏃堕棿" min-width="140px" align="center"></el-table-column>
<el-table-column v-if="containPermissions(['business:company:update', 'business:company:delete'])" label="鎿嶄綔"
- min-width="140" align="center" fixed="right">
+ min-width="160" align="center" fixed="right">
<template slot-scope="{row}">
<el-button type="text" @click="$refs.operaCompanyWindow.open('缂栬緫浼佷笟', row)"
v-permissions="['business:company:update']">缂栬緫</el-button>
diff --git a/platform/src/views/business/goods.vue b/platform/src/views/business/goods.vue
index fffe446..dcc2e33 100644
--- a/platform/src/views/business/goods.vue
+++ b/platform/src/views/business/goods.vue
@@ -54,7 +54,9 @@
<li>
<el-button type="primary" :loading="isWorking.export" @click="bulkOperation(1)">鎵归噺涓嬫灦</el-button>
</li>
- <li v-permissions="['business:goods:delete']"><el-button @click="deleteByIdInBatch" style="color: red;">鎵归噺鍒犻櫎</el-button></li>
+ <li v-permissions="['business:goods:delete']">
+ <el-button type="danger" @click="deleteByIdInBatch">鎵归噺鍒犻櫎</el-button>
+ </li>
</ul>
<el-table v-loading="isWorking.search" :data="tableData.list" stripe border :header-cell-style="rowStyle"
:cell-style="rowStyle" @selection-change="handleSelectionChange">
diff --git a/platform/vue.config.js b/platform/vue.config.js
index 68e3a00..6b5f23a 100644
--- a/platform/vue.config.js
+++ b/platform/vue.config.js
@@ -1,11 +1,24 @@
const outputDir = process.env.VUE_APP_CONTEXT_PATH.substring(1, process.env.VUE_APP_CONTEXT_PATH.length)
+// const proxyMiddleware = require('http-proxy-middleware');
module.exports = {
publicPath: './',
outputDir: outputDir || 'web',
assetsDir: 'static',
lintOnSave: false,
devServer: {
+ // before(app) {
+ // app.use(
+ // [process.env.VUE_APP_API_PREFIX],
+ // proxyMiddleware({
+ // target: process.env.VUE_APP_API,
+ // changeOrigin: true,
+ // pathRewrite: {
+ // [`^${[process.env.VUE_APP_API_PREFIX]}`]: ''
+ // }
+ // })
+ // );
+ // },
host: '0.0.0.0',
port: 10086,
proxy: {
--
Gitblit v1.9.3