fe / yoho-shop-manage · Commits

Go to a project

Authored by 陈峰
Commit a54350939410d644f3121ab331975f91ecf12cb6 1 parent c5a562c3

样式bug和发货tip

Inline Side-by-side
Showing 18 changed files with 106 additions and 159 deletions
<template>
<Alert class="filter-tips" v-bind="$attrs" v-on="$listeners">
<slot></slot>
</Alert>
</template>
<script>
export default {
name: 'filter-tips'
};
</script>
<style lang="scss">
.filter-tips {
display: inline-block;
margin-left: 30px;
}
</style>
... ...
... ... @@ -16,6 +16,7 @@ import DragFileUpload from './drag-file-upload';
import IFrame from './iframe';
import UploadXlsx from './upload-xlsx';
import BackTopDom from './back-top-dom';
import FilterTips from './filter-tips';
export default {
LayoutUserInfo,
... ... @@ -35,5 +36,6 @@ export default {
DragFileUpload,
IFrame,
UploadXlsx,
BackTopDom
BackTopDom,
FilterTips
};
... ...
... ... @@ -29,9 +29,12 @@ export default {
.label-col {
line-height: 32px;
max-width: 80px;
padding: 0 !important;
}
.item-col {
padding: 0 !important;
input,
select,
.ivu-select,
... ...
... ... @@ -16,8 +16,10 @@
</Select>
</filter-item>
<filter-item :label="filters.createTime.label">
<Date-picker v-model="filters.createTime.model"
type="daterange" format="yyyy-MM-dd" placeholder="选择日期">
<Date-picker
v-model="filters.createTime.model"
placement="bottom-end"
type="daterange" format="yyyy-MM-dd" placeholder="选择日期">
</Date-picker>
</filter-item>
<filter-item>
... ... @@ -25,8 +27,10 @@
<Button @click="reset">清空条件</Button>
</filter-item>
</layout-filter>
<layout-list>
<layout-action>
<Button type="warning" @click="exportData" class="table-btn">导出</Button>
</layout-action>
<layout-list>
<Table border :columns="tableCols" :data="tableData"></Table>
<Page :total="pageData.total" :current="pageData.pageNo"
@on-change="pageChange" :page-size="20" show-total></Page>
... ... @@ -151,15 +155,4 @@ export default {
</script>
<style lang="scss">
.ivu-date-picker .ivu-select-dropdown {
left: -284px !important;
}
.table-btn {
margin-bottom: 20px;
}
.ivu-date-picker {
width: 190px;
}
</style>
... ...
... ... @@ -29,8 +29,10 @@
<Button @click="reset">清空条件</Button>
</filter-item>
</layout-filter>
<layout-list>
<layout-action>
<Button type="warning" @click="exportData" class="table-btn">导出</Button>
</layout-action>
<layout-list>
<Table border :columns="tableCols" :data="tableData"></Table>
<Page :total="pageData.total" :current="pageData.pageNo"
@on-change="pageChange" :page-size="20" show-total></Page>
... ... @@ -126,11 +128,4 @@ export default {
</script>
<style lang="scss">
.ivu-date-picker .ivu-select-dropdown {
left: -284px !important;
}
.table-btn {
margin-bottom: 20px;
}
</style>
... ...
... ... @@ -15,9 +15,11 @@
<Button @click="reset">清空条件</Button>
</filter-item>
</layout-filter>
<layout-list>
<Button type="success" @click="print" class="table-btn">打印</Button>
<layout-action>
<Button type="warning" @click="exportData" class="table-btn">导出</Button>
<Button type="success" @click="print" class="table-btn">打印</Button>
</layout-action>
<layout-list>
<Table border :columns="tableCols" :data="tableData"></Table>
<Page :total="pageData.total" :current="pageData.pageNo"
@on-change="pageChange" :page-size="20" show-total></Page>
... ... @@ -109,17 +111,3 @@ export default {
}
};
</script>
<style lang="scss">
.ivu-date-picker .ivu-select-dropdown {
left: -284px !important;
}
.table-btn {
margin-bottom: 20px;
}
.ivu-date-picker {
width: 190px;
}
</style>
... ...
... ... @@ -18,9 +18,11 @@
<Button @click="reset">清空条件</Button>
</filter-item>
</layout-filter>
<layout-list>
<layout-action>
<Button type="warning" @click="exportData" class="table-btn">导出</Button>
<Button type="success" @click="print" class="table-btn">打印</Button>
</layout-action>
<layout-list>
<Table border :columns="tableCols" :data="tableData"></Table>
<Page :total="pageData.total" :current="pageData.pageNo"
@on-change="pageChange" :page-size="20" show-total></Page>
... ... @@ -113,13 +115,3 @@ export default {
}
};
</script>
<style lang="scss">
.ivu-date-picker .ivu-select-dropdown {
left: -284px !important;
}
.table-btn {
margin-bottom: 20px;
}
</style>
... ...
... ... @@ -18,8 +18,11 @@
<Button @click="reset">清空条件</Button>
</filter-item>
</layout-filter>
<layout-list>
<layout-action>
<Button type="warning" @click="exportData" class="table-btn">导出</Button>
</layout-action>
<layout-list>
<Table border :columns="tableCols" :data="tableData"></Table>
<Page :total="pageData.total" :current="pageData.pageNo"
@on-change="pageChange" :page-size="20" show-total></Page>
... ... @@ -139,15 +142,5 @@ export default {
</script>
<style lang="scss">
.ivu-date-picker .ivu-select-dropdown {
left: -284px !important;
}
.table-btn {
margin-bottom: 20px;
}
.ivu-date-picker {
width: 190px;
}
</style>
... ...
... ... @@ -15,9 +15,11 @@
<Button @click="reset">清空条件</Button>
</filter-item>
</layout-filter>
<layout-list>
<Button type="success" @click="print" class="table-btn">打印</Button>
<layout-action>
<Button type="warning" @click="exportData" class="table-btn">导出</Button>
<Button type="success" @click="print" class="table-btn">打印</Button>
</layout-action>
<layout-list>
<Table border :columns="tableCols" :data="tableData"></Table>
<Page :total="pageData.total" :current="pageData.pageNo"
@on-change="pageChange" :page-size="20" show-total></Page>
... ... @@ -109,18 +111,4 @@ export default {
}
}
};
</script>
<style lang="scss">
.ivu-date-picker .ivu-select-dropdown {
left: -284px !important;
}
.table-btn {
margin-bottom: 20px;
}
.ivu-date-picker {
width: 190px;
}
</style>
</script>
\ No newline at end of file
... ...
... ... @@ -99,8 +99,3 @@ export default {
};
</script>
<style lang="scss">
.ivu-date-picker .ivu-select-dropdown {
left: -284px !important;
}
</style>
... ...
... ... @@ -55,12 +55,6 @@ export default {
this.userClass['user-collapse'] = !this.userClass['user-collapse'];
this.breadClass['bread-collapse'] = !this.breadClass['bread-collapse'];
this.layoutClass.collapse = !this.layoutClass.collapse;
setTimeout(() => {
let evtStart = document.createEvent('UIEvent');
evtStart.initUIEvent('resize', true, true);
window.dispatchEvent(evtStart);
}, 500);
},
shopChange() {
cache.clear();
... ...
... ... @@ -8,6 +8,7 @@
<Date-picker
type="daterange"
v-model="dateRange"
placement="bottom-start"
format="yyyy-MM-dd"
placeholder="选择开始结束日期"></Date-picker>
<div class="quick">
... ...
... ... @@ -15,6 +15,7 @@
<filter-item>
<Button type="primary" @click="filterSearch">筛选</Button>
<Button @click="clearFilter">清空条件</Button>
<filter-tips type="warning" show-icon closable>请务必认真填写发货情况及物流信息，否则商品无法正常入库</filter-tips>
</filter-item>
</layout-filter>
<layout-list>
... ...
... ... @@ -42,6 +42,7 @@
<Button type="primary" @click="filterSearch">筛选</Button>
<Button type="warning" @click="exportList">导出</Button>
<Button @click="clearFilter">清空条件</Button>
<filter-tips type="warning" show-icon closable>请务必认真填写发货情况及物流信息，否则商品无法正常入库</filter-tips>
</filter-item>
</layout-filter>
<layout-list>
... ...
... ... @@ -24,6 +24,7 @@
<filter-item>
<Button type="primary" @click="filterSearch">筛选</Button>
<Button @click="clearFilter">清空条件</Button>
<filter-tips type="warning" show-icon closable>请务必认真填写发货情况及物流信息，否则商品无法正常入库</filter-tips>
</filter-item>
</layout-filter>
... ...
... ... @@ -39,6 +39,7 @@
<Button type="primary" @click="filterSearch">筛选</Button>
<Button type="warning" @click="exportList">导出</Button>
<Button @click="clearFilter">清空条件</Button>
<filter-tips type="warning" show-icon closable>请务必认真填写发货情况及物流信息，否则商品无法正常入库</filter-tips>
</filter-item>
</layout-filter>
... ...
... ... @@ -56,7 +56,7 @@
"express": "^4.15.2",
"express-session": "^1.15.2",
"font-awesome": "^4.7.0",
"iview": "^2.0.0",
"iview": "^2.4.0",
"lodash": "^4.17.4",
"moment": "^2.18.1",
"promise-polyfill": "^6.0.2",
... ... @@ -64,12 +64,12 @@
"request-promise": "^4.2.0",
"serve-favicon": "^2.4.2",
"uuid": "^3.1.0",
"vue": "^2.4.2",
"vue": "^2.4.4",
"vue-cookie": "^1.1.4",
"vue-html5-editor": "^1.1.1",
"vue-loader": "^13.0.2",
"vue-loader": "^13.0.5",
"vue-router": "^2.7.0",
"vue-template-compiler": "^2.4.2",
"vue-template-compiler": "^2.4.4",
"xlsx2json": "^1.0.0",
"xss": "^0.3.3",
"yoho-cookie": "^1.2.0",
... ...
... ... @@ -260,9 +260,9 @@ async-foreach@^0.1.3:
version "0.1.3"
resolved "http://npm.yoho.cn/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
async-validator@^1.7.1:
version "1.7.1"
resolved "http://npm.yoho.cn/async-validator/-/async-validator-1.7.1.tgz#89d3d7a384ca5d05e0f07bf51754d591e2cfec61"
async-validator@^1.8.1:
version "1.8.1"
resolved "http://npm.yoho.cn/async-validator/-/async-validator-1.8.1.tgz#6665788ca39269af770e5ee02f0e557f2438d2ca"
dependencies:
babel-runtime "6.x"
... ... @@ -973,6 +973,10 @@ base64-js@^1.0.2:
version "1.2.1"
resolved "http://npm.yoho.cn/base64-js/-/base64-js-1.2.1.tgz#a91947da1f4a516ea38e5b4ec0ec3773675e0886"
batch-processor@^1.0.0:
version "1.0.0"
resolved "http://npm.yoho.cn/batch-processor/-/batch-processor-1.0.0.tgz#75c95c32b748e0850d10c2b168f6bdbe9891ace8"
batch@0.6.1:
version "0.6.1"
resolved "http://npm.yoho.cn/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
... ... @@ -997,7 +1001,7 @@ block-stream@*:
dependencies:
inherits "~2.0.0"
bluebird@^3.0.5, bluebird@^3.1.1, bluebird@^3.3, bluebird@^3.4.0, bluebird@^3.4.6, bluebird@^3.4.7, bluebird@^3.5.0:
bluebird@^3.1.1, bluebird@^3.3, bluebird@^3.4.0, bluebird@^3.4.6, bluebird@^3.4.7, bluebird@^3.5.0:
version "3.5.0"
resolved "http://npm.yoho.cn/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c"
... ... @@ -1492,13 +1496,6 @@ concat-stream@^1.5.2, concat-stream@^1.6.0:
readable-stream "^2.2.2"
typedarray "^0.0.6"
config-chain@~1.1.5:
version "1.1.11"
resolved "http://npm.yoho.cn/config-chain/-/config-chain-1.1.11.tgz#aba09747dfbe4c3e70e766a6e41586e1859fc6f2"
dependencies:
ini "^1.3.4"
proto-list "~1.2.1"
configstore@^1.0.0:
version "1.4.0"
resolved "http://npm.yoho.cn/configstore/-/configstore-1.4.0.tgz#c35781d0501d268c25c54b8b17f6240e8a4fb021"
... ... @@ -1600,7 +1597,7 @@ cookies@0.7.0:
depd "~1.1.0"
keygrip "~1.0.1"
core-js@^2.4.0, core-js@^2.4.1:
core-js@^2.4.0, core-js@^2.5.0:
version "2.5.0"
resolved "http://npm.yoho.cn/core-js/-/core-js-2.5.0.tgz#569c050918be6486b3837552028ae0466b717086"
... ... @@ -1887,9 +1884,9 @@ deep-is@~0.1.3:
version "0.1.3"
resolved "http://npm.yoho.cn/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
deepmerge@^1.5.0:
version "1.5.0"
resolved "http://npm.yoho.cn/deepmerge/-/deepmerge-1.5.0.tgz#00bc5b88fd23b8130f9f5049071c3420e07a5465"
deepmerge@^1.5.1:
version "1.5.2"
resolved "http://npm.yoho.cn/deepmerge/-/deepmerge-1.5.2.tgz#10499d868844cdad4fee0842df8c7f6f0c95a753"
define-properties@^1.1.2:
version "1.1.2"
... ... @@ -2106,15 +2103,6 @@ echarts@^3.6.1:
dependencies:
zrender "^3.6.0"
editorconfig@^0.13.2:
version "0.13.2"
resolved "http://npm.yoho.cn/editorconfig/-/editorconfig-0.13.2.tgz#8e57926d9ee69ab6cb999f027c2171467acceb35"
dependencies:
bluebird "^3.0.5"
commander "^2.9.0"
lru-cache "^3.2.0"
sigmund "^1.0.1"
ee-first@1.1.1:
version "1.1.1"
resolved "http://npm.yoho.cn/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
... ... @@ -2123,6 +2111,12 @@ electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.17:
version "1.3.17"
resolved "http://npm.yoho.cn/electron-to-chromium/-/electron-to-chromium-1.3.17.tgz#41c13457cc7166c5c15e767ae61d86a8cacdee5d"
element-resize-detector@^1.1.12:
version "1.1.12"
resolved "http://npm.yoho.cn/element-resize-detector/-/element-resize-detector-1.1.12.tgz#8b3fd6eedda17f9c00b360a0ea2df9927ae80ba2"
dependencies:
batch-processor "^1.0.0"
elliptic@^6.0.0:
version "6.4.0"
resolved "http://npm.yoho.cn/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df"
... ... @@ -3355,7 +3349,7 @@ inherits@2.0.1:
version "2.0.1"
resolved "http://npm.yoho.cn/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
ini@^1.3.4, ini@~1.3.0:
ini@~1.3.0:
version "1.3.4"
resolved "http://npm.yoho.cn/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
... ... @@ -3675,14 +3669,16 @@ istanbul-lib-instrument@^1.4.2:
istanbul-lib-coverage "^1.1.1"
semver "^5.3.0"
iview@^2.0.0:
version "2.0.0"
resolved "http://npm.yoho.cn/iview/-/iview-2.0.0.tgz#80191df3e1ff31e80f4c7aedb10b96d828db0906"
iview@^2.4.0:
version "2.4.0"
resolved "http://npm.yoho.cn/iview/-/iview-2.4.0.tgz#93b0605581f323f32e307d86a2efb5546df7bb64"
dependencies:
async-validator "^1.7.1"
core-js "^2.4.1"
deepmerge "^1.5.0"
async-validator "^1.8.1"
core-js "^2.5.0"
deepmerge "^1.5.1"
element-resize-detector "^1.1.12"
popper.js "^0.6.4"
tinycolor2 "^1.4.1"
jackpot@>=0.0.6:
version "0.0.6"
... ... @@ -3694,15 +3690,6 @@ js-base64@^2.1.8, js-base64@^2.1.9:
version "2.1.9"
resolved "http://npm.yoho.cn/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce"
js-beautify@^1.6.14:
version "1.6.14"
resolved "http://npm.yoho.cn/js-beautify/-/js-beautify-1.6.14.tgz#d3b8f7322d02b9277d58bd238264c327e58044cd"
dependencies:
config-chain "~1.1.5"
editorconfig "^0.13.2"
mkdirp "~0.5.0"
nopt "~3.0.1"
js-tokens@^3.0.0:
version "3.0.2"
resolved "http://npm.yoho.cn/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
... ... @@ -4131,12 +4118,6 @@ lowercase-keys@^1.0.0:
version "1.0.0"
resolved "http://npm.yoho.cn/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
lru-cache@^3.2.0:
version "3.2.0"
resolved "http://npm.yoho.cn/lru-cache/-/lru-cache-3.2.0.tgz#71789b3b7f5399bec8565dda38aa30d2a097efee"
dependencies:
pseudomap "^1.0.1"
lru-cache@^4.0.1, lru-cache@^4.1.1:
version "4.1.1"
resolved "http://npm.yoho.cn/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55"
... ... @@ -4514,7 +4495,7 @@ nodemon@^1.11.0:
undefsafe "0.0.3"
update-notifier "0.5.0"
"nopt@2 || 3", nopt@~3.0.1:
"nopt@2 || 3":
version "3.0.6"
resolved "http://npm.yoho.cn/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
dependencies:
... ... @@ -5282,6 +5263,10 @@ preserve@^0.2.0:
version "0.2.0"
resolved "http://npm.yoho.cn/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
prettier@^1.7.0:
version "1.7.2"
resolved "http://npm.yoho.cn/prettier/-/prettier-1.7.2.tgz#81371e64018aafc69cf1031956c70e029339f54e"
pretty-error@^2.0.2:
version "2.1.1"
resolved "http://npm.yoho.cn/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"
... ... @@ -5321,10 +5306,6 @@ promise-polyfill@^6.0.2:
version "6.0.2"
resolved "http://npm.yoho.cn/promise-polyfill/-/promise-polyfill-6.0.2.tgz#d9c86d3dc4dc2df9016e88946defd69b49b41162"
proto-list@~1.2.1:
version "1.2.4"
resolved "http://npm.yoho.cn/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
proxy-addr@~1.1.5:
version "1.1.5"
resolved "http://npm.yoho.cn/proxy-addr/-/proxy-addr-1.1.5.tgz#71c0ee3b102de3f202f3b64f608d173fcba1a918"
... ... @@ -5342,7 +5323,7 @@ ps-tree@^1.0.1:
dependencies:
event-stream "~3.3.0"
pseudomap@^1.0.1, pseudomap@^1.0.2:
pseudomap@^1.0.2:
version "1.0.2"
resolved "http://npm.yoho.cn/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
... ... @@ -6018,10 +5999,6 @@ shelljs@^0.7.5, shelljs@^0.7.7:
interpret "^1.0.0"
rechoir "^0.6.2"
sigmund@^1.0.1:
version "1.0.1"
resolved "http://npm.yoho.cn/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
signal-exit@^3.0.0, signal-exit@^3.0.2:
version "3.0.2"
resolved "http://npm.yoho.cn/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
... ... @@ -6635,6 +6612,10 @@ tiny-cookie@^1.0:
version "1.0.1"
resolved "http://npm.yoho.cn/tiny-cookie/-/tiny-cookie-1.0.1.tgz#753786079c642a3c3d0b2accad600f8de119ac2a"
tinycolor2@^1.4.1:
version "1.4.1"
resolved "http://npm.yoho.cn/tinycolor2/-/tinycolor2-1.4.1.tgz#f4fad333447bc0b07d4dc8e9209d8f39a8ac77e8"
tmp@^0.0.31:
version "0.0.31"
resolved "http://npm.yoho.cn/tmp/-/tmp-0.0.31.tgz#8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"
... ... @@ -6903,18 +6884,18 @@ vue-html5-editor@^1.1.1:
version "1.1.1"
resolved "http://npm.yoho.cn/vue-html5-editor/-/vue-html5-editor-1.1.1.tgz#5910210a830d8c8d3479a1f1fec8473192aa03b3"
vue-loader@^13.0.2:
version "13.0.4"
resolved "http://npm.yoho.cn/vue-loader/-/vue-loader-13.0.4.tgz#0a6d893698735fcf7037b20a23d724cb39eee7d4"
vue-loader@^13.0.5:
version "13.0.5"
resolved "http://npm.yoho.cn/vue-loader/-/vue-loader-13.0.5.tgz#3639e9fb3940cded7f0fc34429277fb6de70a57c"
dependencies:
consolidate "^0.14.0"
hash-sum "^1.0.2"
js-beautify "^1.6.14"
loader-utils "^1.1.0"
lru-cache "^4.1.1"
postcss "^6.0.6"
postcss-load-config "^1.1.0"
postcss-selector-parser "^2.0.0"
prettier "^1.7.0"
resolve "^1.3.3"
source-map "^0.5.6"
vue-hot-reload-api "^2.1.0"
... ... @@ -6932,9 +6913,9 @@ vue-style-loader@^3.0.0, vue-style-loader@^3.0.1:
hash-sum "^1.0.2"
loader-utils "^1.0.2"
vue-template-compiler@^2.4.2:
version "2.4.2"
resolved "http://npm.yoho.cn/vue-template-compiler/-/vue-template-compiler-2.4.2.tgz#5a45d843f148b098f6c1d1e35ac20c4956d30ad1"
vue-template-compiler@^2.4.4:
version "2.4.4"
resolved "http://npm.yoho.cn/vue-template-compiler/-/vue-template-compiler-2.4.4.tgz#2cde3b704124985c27d50b5387c9691ba515fb57"
dependencies:
de-indent "^1.0.2"
he "^1.1.0"
... ... @@ -6943,9 +6924,9 @@ vue-template-es2015-compiler@^1.5.3:
version "1.5.3"
resolved "http://npm.yoho.cn/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.5.3.tgz#22787de4e37ebd9339b74223bc467d1adee30545"
vue@^2.4.2:
version "2.4.2"
resolved "http://npm.yoho.cn/vue/-/vue-2.4.2.tgz#a9855261f191c978cc0dc1150531b8d08149b58c"
vue@^2.4.4:
version "2.4.4"
resolved "http://npm.yoho.cn/vue/-/vue-2.4.4.tgz#ea9550b96a71465fd2b8b17b61673b3561861789"
walk@^2.3.9:
version "2.3.9"
... ...