From cb99b1cd9931db0e74150c5a1f8b848ab10ff14d Mon Sep 17 00:00:00 2001 From: zhangsiyu Date: Thu, 15 Jun 2023 09:57:44 +0800 Subject: [PATCH] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit e354b10f751d10f04f48bc79042622b9003ed6e4 Author: 0.0 <1092404103.qq.com> Date: Tue Jun 13 13:58:00 2023 +0800 1.生成配送签收模块 --- npminstall-debug.log | 192 ++++++++++ src/api/distribution/distributionSignfor.js | 50 +++ .../distribution/distributionSignfor.js | 178 +++++++++ src/page/index/top/top-theme.vue | 8 +- src/store/modules/common.js | 2 +- src/styles/theme/bule.scss | 5 + src/styles/theme/cool.scss | 5 + src/styles/theme/star.scss | 5 + src/styles/theme/vip.scss | 5 + src/styles/theme/white.scss | 9 +- .../signfor/distributionSignfor.vue | 347 ++++++++++++++++++ vite.config.js | 2 +- 12 files changed, 800 insertions(+), 8 deletions(-) create mode 100644 npminstall-debug.log create mode 100644 src/api/distribution/distributionSignfor.js create mode 100644 src/option/distribution/distributionSignfor.js create mode 100644 src/views/distribution/signfor/distributionSignfor.vue diff --git a/npminstall-debug.log b/npminstall-debug.log new file mode 100644 index 00000000..d445e9b4 --- /dev/null +++ b/npminstall-debug.log @@ -0,0 +1,192 @@ +{ + root: 'F:\\物流\\logpm_page', + registry: 'https://registry.npmmirror.com', + pkgs: [], + production: false, + cacheStrict: false, + cacheDir: null, + env: { + npm_config_registry: 'https://registry.npmmirror.com', + npm_config_argv: '{"remain":[],"cooked":["--fix-bug-versions","--china","--userconfig=C:\\\\Users\\\\筱峰\\\\.cnpmrc","--disturl=https://npmmirror.com/mirrors/node","--registry=https://registry.npmmirror.com"],"original":["--fix-bug-versions","--china","--userconfig=C:\\\\Users\\\\筱峰\\\\.cnpmrc","--disturl=https://npmmirror.com/mirrors/node","--registry=https://registry.npmmirror.com"]}', + npm_config_user_agent: 'npminstall/7.5.2 npm/? node/v18.16.0 win32 x64', + NODE: 'D:\\nodejs\\node.exe', + npm_node_execpath: 'D:\\nodejs\\node.exe', + npm_execpath: 'C:\\Users\\筱峰\\AppData\\Roaming\\npm\\node_modules\\cnpm\\node_modules\\npminstall\\bin\\install.js', + npm_config_userconfig: 'C:\\Users\\筱峰\\.cnpmrc', + npm_config_disturl: 'https://npmmirror.com/mirrors/node', + npm_config_r: 'https://registry.npmmirror.com', + COREPACK_NPM_REGISTRY: 'https://registry.npmmirror.com', + NODEJS_ORG_MIRROR: 'https://cdn.npmmirror.com/binaries/node', + NVM_NODEJS_ORG_MIRROR: 'https://cdn.npmmirror.com/binaries/node', + PHANTOMJS_CDNURL: 'https://cdn.npmmirror.com/binaries/phantomjs', + CHROMEDRIVER_CDNURL: 'https://cdn.npmmirror.com/binaries/chromedriver', + OPERADRIVER_CDNURL: 'https://cdn.npmmirror.com/binaries/operadriver', + CYPRESS_DOWNLOAD_PATH_TEMPLATE: 'https://cdn.npmmirror.com/binaries/cypress/${version}/${platform}-${arch}/cypress.zip', + ELECTRON_MIRROR: 'https://cdn.npmmirror.com/binaries/electron/', + ELECTRON_BUILDER_BINARIES_MIRROR: 'https://cdn.npmmirror.com/binaries/electron-builder-binaries/', + SASS_BINARY_SITE: 'https://cdn.npmmirror.com/binaries/node-sass', + SWC_BINARY_SITE: 'https://cdn.npmmirror.com/binaries/node-swc', + NWJS_URLBASE: 'https://cdn.npmmirror.com/binaries/nwjs/v', + PUPPETEER_DOWNLOAD_HOST: 'https://cdn.npmmirror.com/binaries/chrome-for-testing', + PUPPETEER_DOWNLOAD_BASE_URL: 'https://cdn.npmmirror.com/binaries/chrome-for-testing', + PLAYWRIGHT_DOWNLOAD_HOST: 'https://cdn.npmmirror.com/binaries/playwright', + SENTRYCLI_CDNURL: 'https://cdn.npmmirror.com/binaries/sentry-cli', + SAUCECTL_INSTALL_BINARY_MIRROR: 'https://cdn.npmmirror.com/binaries/saucectl', + RE2_DOWNLOAD_MIRROR: 'https://cdn.npmmirror.com/binaries/node-re2', + RE2_DOWNLOAD_SKIP_PATH: 'true', + PRISMA_ENGINES_MIRROR: 'https://cdn.npmmirror.com/binaries/prisma', + npm_config_better_sqlite3_binary_host: 'https://cdn.npmmirror.com/binaries/better-sqlite3', + npm_config_keytar_binary_host: 'https://cdn.npmmirror.com/binaries/keytar', + npm_config_sharp_binary_host: 'https://cdn.npmmirror.com/binaries/sharp', + npm_config_sharp_libvips_binary_host: 'https://cdn.npmmirror.com/binaries/sharp-libvips', + npm_config_robotjs_binary_host: 'https://cdn.npmmirror.com/binaries/robotjs', + npm_rootpath: 'F:\\物流\\logpm_page', + INIT_CWD: 'F:\\物流\\logpm_page', + npm_config_cache: 'C:\\Users\\筱峰\\.npminstall_tarball' + }, + binaryMirrors: { + ENVS: { + COREPACK_NPM_REGISTRY: 'https://registry.npmmirror.com', + NODEJS_ORG_MIRROR: 'https://cdn.npmmirror.com/binaries/node', + NVM_NODEJS_ORG_MIRROR: 'https://cdn.npmmirror.com/binaries/node', + PHANTOMJS_CDNURL: 'https://cdn.npmmirror.com/binaries/phantomjs', + CHROMEDRIVER_CDNURL: 'https://cdn.npmmirror.com/binaries/chromedriver', + OPERADRIVER_CDNURL: 'https://cdn.npmmirror.com/binaries/operadriver', + CYPRESS_DOWNLOAD_PATH_TEMPLATE: 'https://cdn.npmmirror.com/binaries/cypress/${version}/${platform}-${arch}/cypress.zip', + ELECTRON_MIRROR: 'https://cdn.npmmirror.com/binaries/electron/', + ELECTRON_BUILDER_BINARIES_MIRROR: 'https://cdn.npmmirror.com/binaries/electron-builder-binaries/', + SASS_BINARY_SITE: 'https://cdn.npmmirror.com/binaries/node-sass', + SWC_BINARY_SITE: 'https://cdn.npmmirror.com/binaries/node-swc', + NWJS_URLBASE: 'https://cdn.npmmirror.com/binaries/nwjs/v', + PUPPETEER_DOWNLOAD_HOST: 'https://cdn.npmmirror.com/binaries/chrome-for-testing', + PUPPETEER_DOWNLOAD_BASE_URL: 'https://cdn.npmmirror.com/binaries/chrome-for-testing', + PLAYWRIGHT_DOWNLOAD_HOST: 'https://cdn.npmmirror.com/binaries/playwright', + SENTRYCLI_CDNURL: 'https://cdn.npmmirror.com/binaries/sentry-cli', + SAUCECTL_INSTALL_BINARY_MIRROR: 'https://cdn.npmmirror.com/binaries/saucectl', + RE2_DOWNLOAD_MIRROR: 'https://cdn.npmmirror.com/binaries/node-re2', + RE2_DOWNLOAD_SKIP_PATH: 'true', + PRISMA_ENGINES_MIRROR: 'https://cdn.npmmirror.com/binaries/prisma', + npm_config_better_sqlite3_binary_host: 'https://cdn.npmmirror.com/binaries/better-sqlite3', + npm_config_keytar_binary_host: 'https://cdn.npmmirror.com/binaries/keytar', + npm_config_sharp_binary_host: 'https://cdn.npmmirror.com/binaries/sharp', + npm_config_sharp_libvips_binary_host: 'https://cdn.npmmirror.com/binaries/sharp-libvips', + npm_config_robotjs_binary_host: 'https://cdn.npmmirror.com/binaries/robotjs' + }, + '@ali/s2': { host: 'https://cdn.npmmirror.com/binaries/looksgood-s2' }, + sharp: { replaceHostFiles: [Array], replaceHostMap: [Object] }, + '@tensorflow/tfjs-node': { + replaceHostFiles: [Array], + replaceHostRegExpMap: [Object], + replaceHostMap: [Object] + }, + cypress: { + host: 'https://cdn.npmmirror.com/binaries/cypress', + newPlatforms: [Object] + }, + 'utf-8-validate': { + host: 'https://cdn.npmmirror.com/binaries/utf-8-validate/v{version}' + }, + xprofiler: { + remote_path: './xprofiler/v{version}/', + host: 'https://cdn.npmmirror.com/binaries' + }, + leveldown: { host: 'https://cdn.npmmirror.com/binaries/leveldown/v{version}' }, + couchbase: { host: 'https://cdn.npmmirror.com/binaries/couchbase/v{version}' }, + gl: { host: 'https://cdn.npmmirror.com/binaries/gl/v{version}' }, + sqlite3: { + host: 'https://cdn.npmmirror.com/binaries/sqlite3', + remote_path: 'v{version}' + }, + '@journeyapps/sqlcipher': { host: 'https://cdn.npmmirror.com/binaries' }, + grpc: { + host: 'https://cdn.npmmirror.com/binaries', + remote_path: '{name}/v{version}' + }, + 'grpc-tools': { host: 'https://cdn.npmmirror.com/binaries' }, + wrtc: { + host: 'https://cdn.npmmirror.com/binaries', + remote_path: '{name}/v{version}' + }, + fsevents: { host: 'https://cdn.npmmirror.com/binaries/fsevents' }, + nodejieba: { host: 'https://cdn.npmmirror.com/binaries/nodejieba' }, + canvas: { host: 'https://cdn.npmmirror.com/binaries/canvas' }, + 'skia-canvas': { host: 'https://cdn.npmmirror.com/binaries/skia-canvas' }, + 'flow-bin': { + replaceHost: 'https://github.com/facebook/flow/releases/download/v', + host: 'https://cdn.npmmirror.com/binaries/flow/v' + }, + 'jpegtran-bin': { + replaceHost: [Array], + host: 'https://cdn.npmmirror.com/binaries/jpegtran-bin' + }, + 'cwebp-bin': { + replaceHost: [Array], + host: 'https://cdn.npmmirror.com/binaries/cwebp-bin' + }, + 'zopflipng-bin': { + replaceHost: [Array], + host: 'https://cdn.npmmirror.com/binaries/zopflipng-bin' + }, + 'optipng-bin': { + replaceHost: [Array], + host: 'https://cdn.npmmirror.com/binaries/optipng-bin' + }, + mozjpeg: { + replaceHost: [Array], + host: 'https://cdn.npmmirror.com/binaries/mozjpeg-bin' + }, + gifsicle: { + replaceHost: [Array], + host: 'https://cdn.npmmirror.com/binaries/gifsicle-bin' + }, + 'pngquant-bin': { + replaceHost: [Array], + host: 'https://cdn.npmmirror.com/binaries/pngquant-bin', + replaceHostMap: [Object] + }, + 'pngcrush-bin': { + replaceHost: [Array], + host: 'https://cdn.npmmirror.com/binaries/pngcrush-bin' + }, + 'jpeg-recompress-bin': { + replaceHost: [Array], + host: 'https://cdn.npmmirror.com/binaries/jpeg-recompress-bin' + }, + 'advpng-bin': { + replaceHost: [Array], + host: 'https://cdn.npmmirror.com/binaries/advpng-bin' + }, + 'pngout-bin': { + replaceHost: [Array], + host: 'https://cdn.npmmirror.com/binaries/pngout-bin' + }, + 'jpegoptim-bin': { + replaceHost: [Array], + host: 'https://cdn.npmmirror.com/binaries/jpegoptim-bin' + }, + argon2: { host: 'https://cdn.npmmirror.com/binaries/argon2' }, + 'ali-zeromq': { host: 'https://cdn.npmmirror.com/binaries/ali-zeromq' }, + 'ali-usb_ctl': { host: 'https://cdn.npmmirror.com/binaries/ali-usb_ctl' }, + 'gdal-async': { host: 'https://cdn.npmmirror.com/binaries/node-gdal-async' } + }, + forbiddenLicenses: null, + flatten: false, + proxy: undefined, + prune: false, + disableFallbackStore: false, + workspacesMap: Map(0) {}, + enableWorkspace: false, + workspaceRoot: 'F:\\物流\\logpm_page', + isWorkspaceRoot: true, + isWorkspacePackage: false, + strictSSL: true, + ignoreScripts: false, + ignoreOptionalDependencies: false, + detail: false, + forceLinkLatest: false, + trace: false, + engineStrict: false, + registryOnly: false, + client: false, + autoFixVersion: [Function: autoFixVersion] +} \ No newline at end of file diff --git a/src/api/distribution/distributionSignfor.js b/src/api/distribution/distributionSignfor.js new file mode 100644 index 00000000..0cba2b35 --- /dev/null +++ b/src/api/distribution/distributionSignfor.js @@ -0,0 +1,50 @@ +import request from '@/axios'; + +export const getList = (current, size, params) => { + return request({ + url: '/signfor/distributionSignfor/list', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} + +export const getDetail = (id) => { + return request({ + url: '/signfor/distributionSignfor/detail', + method: 'get', + params: { + id + } + }) +} + +export const remove = (ids) => { + return request({ + url: '/signfor/distributionSignfor/remove', + method: 'post', + params: { + ids, + } + }) +} + +export const add = (row) => { + return request({ + url: '/signfor/distributionSignfor/submit', + method: 'post', + data: row + }) +} + +export const update = (row) => { + return request({ + url: '/signfor/distributionSignfor/submit', + method: 'post', + data: row + }) +} + diff --git a/src/option/distribution/distributionSignfor.js b/src/option/distribution/distributionSignfor.js new file mode 100644 index 00000000..0a232027 --- /dev/null +++ b/src/option/distribution/distributionSignfor.js @@ -0,0 +1,178 @@ +export default { + expand: false, + index: true, + border: true, + selection: true, + column: [ + { + label: "主键", + prop: "id", + display: false, + hide: true, + }, + { + label: "租户号", + prop: "tenantId", + display: false, + hide: true, + }, + { + label: "创建人", + prop: "createUser", + display: false, + hide: true, + }, + { + label: "创建时间", + prop: "createTime", + display: false, + hide: true, + }, + { + label: "更新人", + prop: "updateUser", + display: false, + hide: true, + }, + { + label: "更新时间", + prop: "updateTime", + display: false, + hide: true, + }, + { + label: "状态", + prop: "status", + display: false, + hide: true, + }, + { + label: "是否已删除", + prop: "isDeleted", + display: false, + hide: true, + }, + { + label: "创建部门", + prop: "createDept", + display: false, + hide: true, + }, + { + label: "预留1", + prop: "reserve1", + display: false, + hide: true, + }, + { + label: "预留2", + prop: "reserve2", + display: false, + hide: true, + }, + { + label: "预留3", + prop: "reserve3", + display: false, + hide: true, + }, + { + label: "预留4", + prop: "reserve4", + display: false, + hide: true, + }, + { + label: "预留5", + prop: "reserve5", + display: false, + hide: true, + }, + { + label: "订单自编号;订单关联id", + prop: "orderId", + }, + { + label: "预约关联Id;预约关联id", + prop: "reservationId", + display: false, + hide: true, + }, + { + label: "收货人", + prop: "consignee", + }, + { + label: "收货地址", + prop: "deliveryAddress", + }, + { + label: "服务类型", + prop: "serveType", + }, + { + label: "配送仓库", + prop: "distributingWarehouse", + }, + { + label: "配送车次", + prop: "trainNumber", + }, + { + label: "订单总数", + prop: "orderTotal", + }, + { + label: "总件数", + prop: "total", + }, + { + label: "装车件数", + prop: "loadedNumber", + }, + { + label: "签收数", + prop: "receivedQuantity", + }, + { + label: "送货司机", + prop: "deliveryDriver", + }, + { + label: "送货司机手机号", + prop: "deliveryDriverPhone", + }, + { + label: "签收时间", + prop: "signingTime", + }, + { + label: "签收人", + prop: "signee", + }, + { + label: "签收状态;1-未签收,2-司机签收,3-文员签收", + prop: "signingStatus", + }, + { + label: "签收类型;1-签收,2-代签收", + prop: "signingType", + }, + { + label: "文员复核图片", + prop: "clerkSignPictures", + }, + { + label: "司机签收图片", + prop: "deliverySignPictures", + }, + { + label: "服务号", + prop: "serviceNumber", + }, + { + label: "备注", + prop: "notes", + }, + ] +} diff --git a/src/page/index/top/top-theme.vue b/src/page/index/top/top-theme.vue index 289d143a..2fde7f57 100644 --- a/src/page/index/top/top-theme.vue +++ b/src/page/index/top/top-theme.vue @@ -74,10 +74,10 @@ export default { name: 'beautiful主题', value: 'theme-beautiful', }, - { - name: 'Mac OS主题', - value: 'mac-os', - }, + // { + // name: 'Mac OS主题', + // value: 'mac-os', + // }, ], }; }, diff --git a/src/store/modules/common.js b/src/store/modules/common.js index 3709e631..c6bee720 100644 --- a/src/store/modules/common.js +++ b/src/store/modules/common.js @@ -10,7 +10,7 @@ const common = { isSearch: false, isRefresh: true, isLock: getStore({ name: 'isLock' }), - themeName: getStore({ name: 'themeName' }) || 'default', + themeName: getStore({ name: 'themeName' }) || 'theme-white', lockPasswd: getStore({ name: 'lockPasswd' }) || '', website: website, setting: website.setting, diff --git a/src/styles/theme/bule.scss b/src/styles/theme/bule.scss index 0c597653..60136e80 100644 --- a/src/styles/theme/bule.scss +++ b/src/styles/theme/bule.scss @@ -32,6 +32,11 @@ i { color: #fff; } + button{ + i{ + color: #000; + } + } } .avue-top { diff --git a/src/styles/theme/cool.scss b/src/styles/theme/cool.scss index 0d4969f0..e6e67d59 100644 --- a/src/styles/theme/cool.scss +++ b/src/styles/theme/cool.scss @@ -171,5 +171,10 @@ i { color: #fff; } + button{ + i{ + color: #000; + } + } } } diff --git a/src/styles/theme/star.scss b/src/styles/theme/star.scss index 36d0817f..133a272f 100644 --- a/src/styles/theme/star.scss +++ b/src/styles/theme/star.scss @@ -112,5 +112,10 @@ i { color: #fff; } + button{ + i{ + color: #000; + } + } } } diff --git a/src/styles/theme/vip.scss b/src/styles/theme/vip.scss index a395ef51..323bf3ef 100644 --- a/src/styles/theme/vip.scss +++ b/src/styles/theme/vip.scss @@ -88,6 +88,11 @@ i { color: $color; } + button{ + i{ + color: #000; + } + } } .avue-top { diff --git a/src/styles/theme/white.scss b/src/styles/theme/white.scss index 1b16bd36..f6b58198 100644 --- a/src/styles/theme/white.scss +++ b/src/styles/theme/white.scss @@ -1,7 +1,7 @@ .theme-white { .el-menu--popup { .el-menu-item { - background-color: #fff; + background-color: #e6810d; i, span { color: #666; @@ -80,7 +80,7 @@ .avue-sidebar { box-shadow: 2px 0 6px rgba(0, 21, 41, 0.15); - background-color: #fff; + background-color: #fff; //左边模块背景颜色 .el-menu-item, .el-sub-menu__title { i, span { @@ -139,5 +139,10 @@ i { color: #fff; } + button{ + i{ + color: #000; + } + } } } diff --git a/src/views/distribution/signfor/distributionSignfor.vue b/src/views/distribution/signfor/distributionSignfor.vue new file mode 100644 index 00000000..ae12ae51 --- /dev/null +++ b/src/views/distribution/signfor/distributionSignfor.vue @@ -0,0 +1,347 @@ + + + diff --git a/vite.config.js b/vite.config.js index faecc216..16a8d419 100644 --- a/vite.config.js +++ b/vite.config.js @@ -12,7 +12,7 @@ export default ({ mode, command }) => { port: 2888, proxy: { '/api': { - target: 'http://localhost:13000', + target: 'http://192.168.2.110:9999', //target: 'http://test3.javablade.com', changeOrigin: true, rewrite: path => path.replace(/^\/api/, ''),