huangyujie
/
qihang-ecom-erp-open
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

This commit is contained in:
Richie 2025-05-19 14:30:28 +08:00
parent d6475ef6bb
commit db4addcf64
5 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/qihang-oms.sql
View File

@ -11,7 +11,7 @@
Target Server Version : 80200
File Encoding : 65001
Date: 19/05/2025 14:18:18
Date: 19/05/2025 14:30:08
*/
SET NAMES utf8mb4;
@ -1395,7 +1395,7 @@ INSERT INTO `o_shop_platform` VALUES (100, '淘宝天猫', 'TMALL', '', NULL, 'h
INSERT INTO `o_shop_platform` VALUES (200, '京东POP', 'JD-POP', '', NULL, 'http://www.qihangerp.cn', 'https://api.jd.com/routerjson', 0, 0, 1);
INSERT INTO `o_shop_platform` VALUES (300, '拼多多', 'PDD', '', NULL, 'http://www.qihangerp.cn', 'https://gw-api.pinduoduo.com/api/router', 0, 0, 1);
INSERT INTO `o_shop_platform` VALUES (400, '抖店', 'DOUDIAN', '', NULL, 'http://www.qihangerp.cn', 'https://openapi-fxg.jinritemai.com/', 0, 0, 1);
INSERT INTO `o_shop_platform` VALUES (500, '微信视频号', 'WEISHOP', '', NULL, 'http://www.qihangerp.cn', 'https://api.weixin.qq.com', 0, 0, 1);
INSERT INTO `o_shop_platform` VALUES (500, '微信小店', 'WEISHOP', '', NULL, 'http://www.qihangerp.cn', 'https://api.weixin.qq.com', 0, 0, 1);
-- ----------------------------
-- Table structure for o_shop_pull_lasttime
@ -13432,7 +13432,7 @@ INSERT INTO `sys_menu` VALUES (2077, '店铺商品管理', 3, 21, 'shop_goods',
INSERT INTO `sys_menu` VALUES (2078, '添加ERP商品', 4, 99, 'create', 'goods/create', NULL, 1, 0, 'C', '1', '0', '', 'checkbox', 'admin', '2024-03-18 07:59:57', 'admin', '2024-09-07 16:41:46', '');
INSERT INTO `sys_menu` VALUES (2079, '字典管理', 5, 9, 'dict', 'system/dict/index', NULL, 1, 0, 'C', '0', '0', '', 'dict', 'admin', '2024-03-18 08:43:55', 'admin', '2024-03-18 08:44:08', '');
INSERT INTO `sys_menu` VALUES (2084, '电子面单设置', 3, 22, 'ewaybill_account', 'shop/ewaybillAccount/index', NULL, 1, 0, 'C', '0', '0', '', 'code', 'admin', '2024-03-21 20:05:09', 'admin', '2025-05-19 14:17:30', '');
INSERT INTO `sys_menu` VALUES (2086, '定时任务配置', 3, 80, 'sys_task', 'system/task/index', NULL, 1, 0, 'C', '0', '0', '', 'time-range', 'admin', '2024-03-22 19:29:20', 'admin', '2025-05-19 14:14:06', '');
INSERT INTO `sys_menu` VALUES (2086, '定时任务配置', 3, 80, 'task_list', 'shop/task/index', NULL, 1, 0, 'C', '0', '0', '', 'time-range', 'admin', '2024-03-22 19:29:20', 'admin', '2025-05-19 14:24:21', '');
INSERT INTO `sys_menu` VALUES (2087, '发货管理', 0, 20, 'ship', NULL, NULL, 1, 0, 'M', '0', '0', '', 'guide', 'admin', '2024-03-30 17:36:10', 'admin', '2024-08-25 15:45:48', '');
INSERT INTO `sys_menu` VALUES (2088, '发货快递管理', 2087, 9, 'ship_logistics', 'shipping/logistics/company', NULL, 1, 0, 'C', '0', '0', '', 'checkbox', 'admin', '2024-03-30 17:37:01', 'admin', '2024-12-08 16:19:02', '');
INSERT INTO `sys_menu` VALUES (2089, '发货记录', 2087, 3, 'record', 'shipping/index', NULL, 1, 0, 'C', '0', '0', '', 'guide', 'admin', '2024-03-30 17:37:42', 'admin', '2024-07-28 18:56:02', '');

9
vue/src/views/order/shopOrder/pull_log.vue
View File

@ -39,10 +39,11 @@
</el-table-column>
<el-table-column label="平台" align="center" prop="shopType" >
<template slot-scope="scope">
<el-tag size="small" v-if="scope.row.shopType === 1">天猫</el-tag>
<el-tag size="small" v-if="scope.row.shopType === 2">京东</el-tag>
<el-tag size="small" v-if="scope.row.shopType === 3">抖店</el-tag>
<el-tag size="small" v-if="scope.row.shopType === 4">拼多多</el-tag>
<el-tag size="small" v-if="scope.row.shopType === 100">淘宝天猫</el-tag>
<el-tag size="small" v-if="scope.row.shopType === 200">京东POP</el-tag>
<el-tag size="small" v-if="scope.row.shopType === 400">抖店</el-tag>
<el-tag size="small" v-if="scope.row.shopType === 500">微信小店</el-tag>
<el-tag size="small" v-if="scope.row.shopType === 300">拼多多</el-tag>
</template>
</el-table-column>
<el-table-column label="类型" align="center" prop="pullType" >

6
vue/src/views/shop/online_shop.vue
View File

@ -60,9 +60,9 @@
<el-table v-loading="loading" :data="shopList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="店铺ID" align="center" prop="id" />
<el-table-column label="店铺名" align="center" prop="name" />
<el-table-column label="平台" align="center" prop="type" >
<el-table-column label="店铺ID" align="center" prop="id" width="100" />
<el-table-column label="店铺名" align="left" prop="name" />
<el-table-column label="平台" align="left" prop="type" >
<template slot-scope="scope">
<el-tag >{{typeList.find(x=>x.id === scope.row.type)?typeList.find(x=>x.id === scope.row.type).name:''}}</el-tag>
</template>

12
vue/src/views/shop/platform/index.vue
View File

@ -9,12 +9,12 @@
<el-table v-loading="loading" :data="shopList" >
<!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column label="ID" align="center" prop="id" />
<el-table-column label="平台" align="center" prop="name" />
<el-table-column label="AppKey" align="center" prop="appKey" />
<el-table-column label="AppSecret" align="center" prop="appSecret" />
<el-table-column label="回调URL" align="center" prop="redirectUri" />
<el-table-column label="接口请求URL" align="center" prop="serverUrl" />
<el-table-column label="ID" align="center" prop="id" width="100"/>
<el-table-column label="平台" align="left" prop="name" />
<el-table-column label="AppKey" align="left" prop="appKey" />
<el-table-column label="AppSecret" align="left" prop="appSecret" />
<el-table-column label="回调URL" align="left" prop="redirectUri" />
<el-table-column label="接口请求URL" align="left" prop="serverUrl" />
<el-table-column label="状态" align="center" width="100">
<template slot-scope="scope">
<el-switch

6
vue/src/views/system/task/index.vue → vue/src/views/shop/task/index.vue
View File

@ -23,14 +23,14 @@
<el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" prop="id" width="100" />
<el-table-column label="任务名称" align="center" prop="taskName" />
<el-table-column label="任务名称" align="left" prop="taskName" />
<el-table-column label="表达式（-表示不运行）" align="center" prop="cron" />
<el-table-column label="执行函数" align="center" prop="method" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="创建时间" align="center" prop="createTime" width="100">
<el-table-column label="创建时间" align="center" prop="createTime" width="150">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">