Merge remote-tracking branch 'origin/master'

# Conflicts:
#	generate-code/cli.js

generate-code/cli.js

@@ -0,0 +1,104 @@
+#! /usr/bin/env node
+
+// Node Cli 应用入口文件必须要有这样的文件头
+// 如果是 Linux 或者 macos 系统还需要修改此文件的读写权限为 755
+// 具体是通过 chmod 755 cli.js 实现修改
+
+// console.log('working');
+// 脚手架的工作过程
+// 1.通过命令交互询问用户问题
+// 2.根据用户回答的结果生成文件
+
+const inquirer = require('inquirer');
+const fs = require('fs');
+const path = require('path');
+const ejs = require('ejs');
+const { tmpdir } = require('os');
+const { createPartiallyEmittedExpression } = require('typescript');
+
+// 读取json
+const list = JSON.parse(fs.readFileSync('./generate-code/pc_menu_企业风管.json'));
+// 目标目录
+// const destDir = process.cwd();
+const destDir = path.join(process.cwd(), 'src/pages');
+
+//检查某个目录是否存在
+function hasFile(url, code) {
+	const temp = path.join(url, `/${code}`);
+	try {
+		//检查某个目录是否存在
+		fs.statSync(temp);
+		return true;
+	} catch (error) {
+		console.log(temp);
+		console.log(error);
+		return false;
+	}
+}
+
+// 模板目录
+const tempDir = path.join(__dirname, 'templates');
+
+function writeFile(url, code) {
+	if (!hasFile(url, code)) {
+		const temp = path.join(url, `/${code}`);
+		console.log(temp);
+		return fs.promises.mkdir(temp);
+	}
+	return Promise.resolve(false);
+}
+list.forEach((el) => {
+	const { code, children } = el;
+	writeFile(destDir, code).then(() => {
+		if (children) {
+			children.forEach((item) => {
+				writeFile(path.join(destDir, `/${code}`), item.code).then(() => {
+					if (item.children) {
+						item.children.forEach((e) => {
+							const path1 = `/${code}/${item.code}`;
+							writeFile(path.join(destDir, path1), e.code).then(() => {
+								const path2 = `${path1}/${e.code}`;
+								// index.vue
+								if (!hasFile(path.join(destDir, path2), 'index.vue')) {
+									const template = `
+
+									`;
+									fs.writeFileSync(path.join(destDir, `${path2}/index.vue`), template);
+								}
+								// components
+								writeFile(path.join(destDir, `${path2}`), 'components').then(() => {
+									if (e.children) {
+										const path3 = `${path2}/components`;
+										e.children.forEach((ele) => {
+											writeFile(path.join(destDir, path3), ele.code).then((res) => {
+												if (res) {
+													if (
+														!hasFile(
+															path.join(destDir, `${path3}/${ele.code}`),
+															'index.vue'
+														)
+													) {
+														const template = `
+														`;
+														fs.writeFileSync(
+															path.join(destDir, `${path3}${ele.code}/index.vue`),
+															template
+														).then(res => {
+															if (res) {
+
+															}
+														}
+													}
+												}
+											});
+										});
+									}
+								});
+							});
+						});
+					}
+				});
+			});
+		}
+	});
+});

generate-code/template.js

@@ -0,0 +1,83 @@
+const template = `
+<template>
+<!-- ${e.title} -->
+    <div class="${e.code}">
+        <Filter @search="updateColumn" />
+        <a-table :columns="columns"
+                class="srcollYTable"
+                :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+                :pagination="false"
+                :expandedRowKeys="expandedRowKeys"
+                :customRow="Rowclick"
+                rowKey="key"
+                :data-source="tableList">
+        </a-table>
+        <ControlModal :selectedRow="selectedRow"
+            @refresh="getData" />
+        <component :is="componentId"></component>
+    </div>
+</template>
+<script lang="ts">
+import { defineComponent, initData, getTableColumns, getTableEvent, contextMenu, BtnList, _getBtnList, queryTableList } from '@/common/export/table';
+
+export default defineComponent({
+    name: '${e.code}',
+    components: { Filter, contextMenu, BtnList, ControlModal },
+    setup() {
+        // 表头数据
+        const { columns, registerColumn, updateColumn } = getTableColumns();
+        // 表格操作按钮列表
+        const [firstBtn] = _getBtnList('platinum_pick_query_tab', true).value;
+        const btnList = ref<BtnListType[]>([]);
+        const event: TableEventCB = {
+            contextmenuCB: (record: QhjTradeGoodsPickup) => {
+                btnList.value = handleTableList(firstBtn, record);
+            },
+        };
+        // 表格事件
+        const { expandedRowKeys, selectedRow, Rowclick, btnClick } = getTableEvent<QhjTradeGoodsPickup>(event);
+
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<QhjTradeGoodsPickup>();
+
+        function getData() {
+            // 获取列表数据
+            queryTable(queryTradeGoodsPickup).then((res) => {
+                tableList.value = res.map((el) => {
+                    return { ...el, key: String(el.takeorderid) };
+                });
+            });
+        }
+
+        // 1:备货中  完成备货
+        // 2:待取货(自提) 确认取货
+        // 4:待收货(邮寄) 上传物流信息、确认收货
+        initData(() => {
+            // 获取列表数据
+            getData();
+            // 注册表头信息 过滤
+            registerColumn('table_pcweb_qhj_pickup_query', ['reqtime', 'pickupgoodsname', 'takeorderstatus', 'goodsname']);
+        });
+
+        return {
+            btnList,
+            columns,
+            getData,
+            updateColumn,
+            expandedRowKeys,
+            selectedRow,
+            Rowclick,
+            firstBtn,
+            loading,
+            tableList,
+            queryTable,
+            btnClick,
+            getPickUpStateName,
+            getTakeStateName,
+            handleTableList,
+        };
+    },
+});
+
+</script >
+`;

generate-code/templates/table.js

@@ -0,0 +1,85 @@
+exports function getTableTemplete(e) {
+	return `
+<template>
+<!-- ${e.title} -->
+    <div class="${e.code}">
+        <Filter @search="updateColumn" />
+        <a-table :columns="columns"
+                class="srcollYTable"
+                :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+                :pagination="false"
+                :expandedRowKeys="expandedRowKeys"
+                :customRow="Rowclick"
+                rowKey="key"
+                :data-source="tableList">
+        </a-table>
+        <ControlModal :selectedRow="selectedRow"
+            @refresh="getData" />
+        <component :is="componentId"></component>
+    </div>
+</template>
+<script lang="ts">
+import { defineComponent, initData, getTableColumns, getTableEvent, contextMenu, BtnList, _getBtnList, queryTableList } from '@/common/export/table';
+
+export default defineComponent({
+    name: '${e.code}',
+    components: { Filter, contextMenu, BtnList, ControlModal },
+    setup() {
+        // 表头数据
+        const { columns, registerColumn, updateColumn } = getTableColumns();
+        // 表格操作按钮列表
+        const [firstBtn] = _getBtnList('platinum_pick_query_tab', true).value;
+        const btnList = ref<BtnListType[]>([]);
+        const event: TableEventCB = {
+            contextmenuCB: (record: QhjTradeGoodsPickup) => {
+                btnList.value = handleTableList(firstBtn, record);
+            },
+        };
+        // 表格事件
+        const { expandedRowKeys, selectedRow, Rowclick, btnClick } = getTableEvent<QhjTradeGoodsPickup>(event);
+
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<QhjTradeGoodsPickup>();
+
+        function getData() {
+            // 获取列表数据
+            queryTable(queryTradeGoodsPickup).then((res) => {
+                tableList.value = res.map((el) => {
+                    return { ...el, key: String(el.takeorderid) };
+                });
+            });
+        }
+
+        // 1:备货中  完成备货
+        // 2:待取货(自提) 确认取货
+        // 4:待收货(邮寄) 上传物流信息、确认收货
+        initData(() => {
+            // 获取列表数据
+            getData();
+            // 注册表头信息 过滤
+            registerColumn('table_pcweb_qhj_pickup_query', ['reqtime', 'pickupgoodsname', 'takeorderstatus', 'goodsname']);
+        });
+
+        return {
+            btnList,
+            columns,
+            getData,
+            updateColumn,
+            expandedRowKeys,
+            selectedRow,
+            Rowclick,
+            firstBtn,
+            loading,
+            tableList,
+            queryTable,
+            btnClick,
+            getPickUpStateName,
+            getTakeStateName,
+            handleTableList,
+        };
+    },
+});
+
+</script >
+`;
+}

public/config/app.config.json

@@ -1,3 +1,3 @@
 {
-    "apiUrl": "http://218.17.158.45:21001/cfg?key=test_176"
+    "apiUrl": "http://192.168.31.171:8080/cfg?key=test_171"
 }

src/services/bus/login.ts

@@ -52,6 +52,8 @@ export const login = async (logidCode: string, password: string, byteArr: Uint8A
  * 缓存登录信息
  */
 export function setLoginData(loginData: LoginResponse) {
+    console.log('loginData', loginData);
+
     sessionStorageUtil.setItem('loginData', loginData);
 }
 

src/services/request/serviceURL.ts

@@ -29,6 +29,7 @@ interface URL {
     iOS: string;
     android: string;
     pcNewsUrl: string;
+    pcMangerUrl: string;
 }
 
 export let serviceURL: URL = {
@@ -52,6 +53,7 @@ export let serviceURL: URL = {
     iOS: '',
     android: '',
     pcNewsUrl: '',
+    pcMangerUrl: '',
 };
 
 /**

src/views/platinum/platinum_capital_flow/platinum_capital_flow_tab/index.vue

@@ -1,13 +1,12 @@
 <template>
   <!-- 资金流水: 资金流水-->
   <div class="platinum_capital_flow_tab">
-    资金流水
     <iframe :src="url"></iframe>
   </div>
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
+import { defineComponent, ref } from 'vue';
 import { initData } from '@/common/methods';
 import { getToken } from '@/services/bus/token';
 import { serviceURL } from '@/services/request/serviceURL';
@@ -17,8 +16,10 @@ export default defineComponent({
     components: {},
     setup() {
         const token = getToken();
-        const url = 'http://192.168.31.171:5035/pcmanage/';
-        initData(() => {});
+        const url = ref<string>('');
+        initData(() => {
+            url.value = `${serviceURL.pcMangerUrl}?token=${token}`;
+        });
         return { url };
     },
 });

src/views/platinum/platinum_pick_query/list/tab/index.vue

@@ -47,6 +47,7 @@
     </contextMenu>
     <ControlModal :selectedRow="selectedRow"
                   @refresh="getData" />
+    <component :is="componentId"></component>
   </div>
 </template>
 

src/views/platinum/platinum_promotion_report/platinum_promotion_report_tab/index.vue

@@ -1,13 +1,12 @@
 <template>
   <!-- 推广报表: 推广报表-->
   <div class="platinum_promotion_report_tab">
-    推广报表
     <iframe :src="url"></iframe>
   </div>
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
+import { defineComponent, ref } from 'vue';
 import { initData } from '@/common/methods';
 import { getToken } from '@/services/bus/token';
 import { serviceURL } from '@/services/request/serviceURL';
@@ -17,8 +16,10 @@ export default defineComponent({
     components: {},
     setup() {
         const token = getToken();
-        const url = 'http://192.168.31.171:5035/pcmanage/';
-        initData(() => {});
+        const url = ref<string>('');
+        initData(() => {
+            url.value = `${serviceURL.pcMangerUrl}?token=${token}`;
+        });
         return { url };
     },
 });