update

generate-code/cli.js

@@ -13,6 +13,8 @@ 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'));
@@ -28,6 +30,8 @@ function hasFile(url, code) {
 		fs.statSync(temp);
 		return true;
 	} catch (error) {
+		console.log(temp);
+		console.log(error);
 		return false;
 	}
 }
@@ -37,11 +41,12 @@ 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();
+	return Promise.resolve(false);
 }
-
 list.forEach((el) => {
 	const { code, children } = el;
 	writeFile(destDir, code).then(() => {
@@ -50,19 +55,45 @@ list.forEach((el) => {
 				writeFile(path.join(destDir, `/${code}`), item.code).then(() => {
 					if (item.children) {
 						item.children.forEach((e) => {
-							writeFile(path.join(destDir, `/${code}/${item.code}`), e.code).then(() => {
-								if (!hasFile(path.join(destDir, `/${code}/${item.code}`), 'index.vue')) {
-									const obj = { code: e.code };
-									// ejs.renderFile(tempDir, obj, (err, result) => {
-									// 	if (err) throw err;
-									// 	// fs.writeFileSync(path.join(destDir, `/${code}/${item.code}/${e.code}`), result);
-									// });
-									fs.writeFileSync(
-										path.join(destDir, `/${code}/${item.code}/${e.code}/index.vue`),
-										''
-									);
+							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);
 								}
-								writeFile(path.join(destDir, `/${code}/${item.code}/${e.code}`), 'components');
+								// 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) {
+
+															}
+														}
+													}
+												}
+											});
+										});
+									}
+								});
 							});
 						});
 					}
@@ -71,35 +102,3 @@ list.forEach((el) => {
 		}
 	});
 });
-
-// console.log(list);
-// inquirer
-// 	.prompt([
-// 		{
-// 			type: 'input',
-// 			name: 'name',
-// 			message: 'Project name'
-// 		}`
-// 	])
-// 	.then((ansers) => {
-// 		// console.log(ansers);
-// 		// 根据用户回答的结果生成文件
-
-// 		// 模板目录
-// 		const tempDir = path.join(__dirname, 'templates');
-// 		// 目标目录
-// 		const destDir = process.cwd();
-
-// 		// 将模板下的文件全部转换到目标下目录
-// 		fs.readdir(tempDir, (err, files) => {
-// 			if (err) throw err;
-// 			files.forEach((file) => {
-// 				// 通过目标引擎渲染文件
-// 				ejs.renderFile(path.join(tempDir, file), ansers, (err, result) => {
-// 					if (err) throw err;
-// 					// 将结果写入目标文件路径
-// 					// fs.writeFileSync(path.join(destDir, file), result);
-// 				});
-// 			});
-// 		});
-// 	});

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/index.vue

@@ -1,127 +0,0 @@
-<template>
-  <!-- 提货查询 -->
-  <div class="<%= code %>">
-    <Filter @search="updateColumn" />
-    <contextMenu :contextMenuList="btnList">
-      <a-table :columns="columns"
-               class="srcollYTable"
-               :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
-               :pagination="false"
-               :expandedRowKeys="expandedRowKeys"
-               :customRow="Rowclick"
-               rowKey="key"
-               :data-source="tableList">
-        <!-- 额外的展开行 -->
-        <template #expandedRowRender="{ record }">
-          <BtnList :btnList="handleTableList(firstBtn, record)"
-                   @onClick="btnClick(record)" />
-        </template>
-        <!-- 提货状态 -->
-        <template #takeorderstatus="{ record }">
-          <a>{{ getPickUpStateName(record.takeorderstatus) }}</a>
-        </template>
-        <!-- 提货/ 收货人-->
-        <template #takemode="{ record }">
-          <a>{{ getTakeStateName(record.takemode)}}</a>
-        </template>
-
-        <!-- 物流信息 -->
-        <template #expresscompany="{ record }">
-          <a>{{ record.expresscompany + "-" + record.expressnum}}</a>
-        </template>
-
-        <!-- 商品数量 -->
-        <template #qty="{ record }">
-          <a>{{ record.qty + record.enumdicname}}</a>
-        </template>
-
-        <!-- 地址 -->
-        <template #address="{ record }">
-          <a>{{ record.provincename + record.cityname + record.districtname + record.address}}</a>
-        </template>
-
-        <template #userinfotype="{ record }">
-          <a>{{ record.userinfotype === 1 ? '个人' : '企业' }}</a>
-        </template>
-      </a-table>
-    </contextMenu>
-    <ControlModal :selectedRow="selectedRow"
-                  @refresh="getData" />
-  </div>
-</template>
-
-<script lang="ts">
-import { defineComponent, initData, getTableColumns, getTableEvent, contextMenu, BtnList, _getBtnList, queryTableList } from '@/common/export/table';
-import Filter from '../../compoments/filter/index.vue';
-import { handleTableList } from './setup';
-import ControlModal from './compoments/controlModal/index.vue';
-import { QhjTradeGoodsPickup } from '@/services/go/ermcp/qhj/interface';
-import { getPickUpStateName, getTakeStateName } from '@/common/constants/enumsName';
-import { TableEventCB, BtnList as BtnListType } from '@/common/setup/table/interface';
-import { ref } from 'vue';
-import { queryTradeGoodsPickup } from '@/services/go/ermcp/qhj';
-
-export default defineComponent({
-    name: '<%= 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>
-
-<style lang="less">
-.<%= code % > {
-}
-</style>;

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 };
     },
 });